diff --git a/modules/game_interface/gameinterface.lua b/modules/game_interface/gameinterface.lua
index 3b88522..5507eb6 100644
--- a/modules/game_interface/gameinterface.lua
+++ b/modules/game_interface/gameinterface.lua
@@ -201,7 +201,7 @@ function tryExit()
     return true
   end
 
-  local exitFunc = function() g_game.safeLogout() forceExit() end
+  local exitFunc = function() scheduleEvent(exit, 10) end
   local logoutFunc = function() g_game.safeLogout() exitWindow:destroy() exitWindow = nil end
   local cancelFunc = function() exitWindow:destroy() exitWindow = nil end
 
diff --git a/modules/game_topbar/topbar.lua b/modules/game_topbar/topbar.lua
index da73010..30d2c87 100644
--- a/modules/game_topbar/topbar.lua
+++ b/modules/game_topbar/topbar.lua
@@ -141,7 +141,7 @@ end
 
 function setupTopBar()
     local topPanel = modules.game_interface.getTopBar()
-    topBar = topBar or g_ui.loadUI('TopBar', topPanel)
+    topBar = topBar or g_ui.loadUI('topbar', topPanel)
     topBar = topBar or g_ui.createWidget('TopBar', topPanel)
 
     manaBar = topBar.stats.mana
diff --git a/otclient_dx.exe b/otclient_dx.exe
index 2f7c11c..f62852a 100644
Binary files a/otclient_dx.exe and b/otclient_dx.exe differ
diff --git a/otclient_gl.exe b/otclient_gl.exe
index 7899ee7..a57d5b9 100644
Binary files a/otclient_gl.exe and b/otclient_gl.exe differ
diff --git a/otclient_linux b/otclient_linux
index 2b16b32..337263b 100644
Binary files a/otclient_linux and b/otclient_linux differ
diff --git a/otclient_mac b/otclient_mac
index b6ff5d6..ff029dc 100644
Binary files a/otclient_mac and b/otclient_mac differ
diff --git a/otclientv8.apk b/otclientv8.apk
index 26b350b..4cb66f9 100644
Binary files a/otclientv8.apk and b/otclientv8.apk differ