diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml
index 10cbe5c1e3..af9a61105c 100644
--- a/ethereal/assets/qml/wallet.qml
+++ b/ethereal/assets/qml/wallet.qml
@@ -318,14 +318,6 @@ ApplicationWindow {
 
 	}
 
-	function importApp(path) {
-		var ext = path.split('.').pop()
-		if(ext == "html" || ext == "htm") {
-			ui.openHtml(path)
-		}else if(ext == "qml"){
-			ui.openQml(path)
-		}
-	}
 
 	/******************
 	 * Dialogs
@@ -340,6 +332,17 @@ ApplicationWindow {
 	}
 
 
+	/******************
+	 * Wallet functions
+	 *****************/
+	function importApp(path) {
+		var ext = path.split('.').pop()
+		if(ext == "html" || ext == "htm") {
+			ui.openHtml(path)
+		}else if(ext == "qml"){
+			ui.openQml(path)
+		}
+	}
 
 	function setWalletValue(value) {
 		walletValueLabel.text = value
@@ -381,9 +384,9 @@ ApplicationWindow {
 		return time;
 	}
 
-	// ******************************************
-	// Windows
-	// ******************************************
+	/**********************
+	 * Windows
+	 *********************/
 	Window {
 		id: peerWindow
 		//flags: Qt.CustomizeWindowHint | Qt.Tool | Qt.WindowCloseButtonHint
diff --git a/ethereal/gui.go b/ethereal/gui.go
index e0a415201c..78a930e026 100644
--- a/ethereal/gui.go
+++ b/ethereal/gui.go
@@ -106,11 +106,13 @@ func (gui *Gui) Start(assetPath string) {
 	logger.Infoln("Starting GUI")
 	gui.open = true
 	win.Show()
+
 	// only add the gui logger after window is shown otherwise slider wont be shown
 	if addlog {
 		ethlog.AddLogSystem(gui)
 	}
 	win.Wait()
+
 	// need to silence gui logger after window closed otherwise logsystem hangs (but do not save loglevel)
 	gui.logLevel = ethlog.Silence
 	gui.open = false
diff --git a/ethereal/ui_lib.go b/ethereal/ui_lib.go
index 1d9085fcb1..b7cabf3a8e 100644
--- a/ethereal/ui_lib.go
+++ b/ethereal/ui_lib.go
@@ -112,7 +112,6 @@ func (self *UiLib) StartDbWithCode(code string) {
 
 func (self *UiLib) StartDebugger() {
 	dbWindow := NewDebuggerWindow(self)
-	//self.DbWindow = dbWindow
 
 	dbWindow.Show()
 }