diff --git a/modules/client_entergame/entergame.lua b/modules/client_entergame/entergame.lua
index 9b93e129..182b4993 100644
--- a/modules/client_entergame/entergame.lua
+++ b/modules/client_entergame/entergame.lua
@@ -98,7 +98,7 @@ function EnterGame.init()
 end
 
 function EnterGame.firstShow()
-  enterGame:show()
+  EnterGame.show()
 
   local account = g_crypt.decrypt(g_settings.get('account'))
   local password = g_crypt.decrypt(g_settings.get('password'))
diff --git a/modules/client_locales/locales/pt.lua b/modules/client_locales/locales/pt.lua
index 2c2d3bc5..82d0ea1f 100644
--- a/modules/client_locales/locales/pt.lua
+++ b/modules/client_locales/locales/pt.lua
@@ -186,6 +186,7 @@ locale = {
     ["Offer History"] = "Histórico de ofertas",
     ["Offers"] = "Ofertas",
     ["Offer Type:"] = "Tipo de oferta:",
+    ["Offline Training"] = "Treino Offline",
     ["Ok"] = "Ok",
     ["Okay"] = "Okay",
     ["on %s.\n"] = "em %s.\n",
@@ -217,6 +218,8 @@ locale = {
     ["Randomize characters outfit"] = "Gerar roupa aleatória",
     ["Reason:"] = "Motivo:",
     ["Refresh"] = "Atualizar",
+    ["Refresh Offers"] = "Atualizar Ofertas",
+    ["Regeneration Time"] = "Tempo de Regeneração",
     ["Reject"] = "Rejeitar",
     ["Reload"] = "Recarregar",
     ["Reload All"] = "Recarregar Todos",
@@ -226,6 +229,7 @@ locale = {
     ["Remove %s"] = "Remover %s",
     ["Report Bug"] = "Reportar defeito",
     ["Reserved for more functionality later."] = "Reservado para futura maior funcionalidade.",
+    ["Reset Market"] = "Resetar Mercado",
     ["Revoke %s's Invitation"] = "Não aceitar o convite do %s",
     ["Rotate"] = "Girar",
     ["Rule Violation"] = "Violação de regra",
@@ -260,6 +264,7 @@ locale = {
     ["Skills"] = "Habilidades",
     ["Soul"] = "Alma",
     ["Soul Points"] = "Pontos de Alma",
+    ["Speed"] = "Velocidade",
     ["Stamina"] = "Vigor",
     ["Start"] = "Começar",
     ["Statement:"] = "Afirmação:",
diff --git a/modules/client_skins/skins/default/styles/miniwindow.otui b/modules/client_skins/skins/default/styles/miniwindow.otui
index 9822526f..9dee716f 100644
--- a/modules/client_skins/skins/default/styles/miniwindow.otui
+++ b/modules/client_skins/skins/default/styles/miniwindow.otui
@@ -62,12 +62,13 @@ MiniWindow < UIMiniWindow
     anchors.right: parent.right
     step: 14
     margin-top: 22
-    margin-right: 2
+    margin-right: 3
     margin-bottom: 3
     pixels-scroll: true
 
     $!on:
       width: 0
+      margin-right: 4
 
   ResizeBorder
     id: bottomResizeBorder
@@ -76,16 +77,17 @@ MiniWindow < UIMiniWindow
     anchors.right: parent.right
     height: 3
     minimum: 48
+    margin-left: 3
+    margin-right: 3
     background: #ffffff88
 
 MiniWindowContents < ScrollablePanel
   id: contentsPanel
   anchors.fill: parent
   anchors.right: miniwindowScrollBar.left
-  margin-right: -1
-  margin-top: 21
-  padding: 4
-  padding-top: 2
+  margin-left: 3
+  margin-bottom: 3
+  margin-top: 22
   vertical-scrollbar: miniwindowScrollBar
 
 BorderlessGameWindow < UIWindow
diff --git a/modules/client_topmenu/topmenu.otui b/modules/client_topmenu/topmenu.otui
index 50edb610..fabec497 100644
--- a/modules/client_topmenu/topmenu.otui
+++ b/modules/client_topmenu/topmenu.otui
@@ -70,7 +70,7 @@ TopPanel
     id: frameCounter
     anchors.top: parent.top
     anchors.left: prev.right
-    margin-top: 8
+    margin-top: 10
     margin-right: 5
     @onSetup: |
       cycleEvent(function()
diff --git a/modules/game_battle/battle.lua b/modules/game_battle/battle.lua
index 5d1b2e6f..0c8e6869 100644
--- a/modules/game_battle/battle.lua
+++ b/modules/game_battle/battle.lua
@@ -196,7 +196,7 @@ function addCreature(creature)
     local creatureWidget = battleButton:getChildById('creature')
     local labelWidget = battleButton:getChildById('label')
     local lifeBarWidget = battleButton:getChildById('lifeBar')
-    battleButton.onHoverChange = onbattleButtonHoverChange
+    battleButton.onHoverChange = onBattleButtonHoverChange
     battleButton.onMouseRelease = onMouseRelease
 
     battleButton:setId('BattleButton_' .. creature:getName():gsub('%s','_'))
@@ -325,7 +325,7 @@ function setLifeBarPercent(battleButton, percent)
   lifeBarWidget:setBackgroundColor(color)
 end
 
-function onbattleButtonHoverChange(widget, hovered)
+function onBattleButtonHoverChange(widget, hovered)
   if widget.isBattleButton then
     widget.isHovered = hovered
     checkBattleButton(widget)
diff --git a/modules/game_battle/battle.otui b/modules/game_battle/battle.otui
index b131d34e..2b19b89b 100644
--- a/modules/game_battle/battle.otui
+++ b/modules/game_battle/battle.otui
@@ -99,7 +99,7 @@ MiniWindow
       anchors.right: parent.right
       anchors.top: prev.bottom
       margin-top: 5
+      padding-right: 5
       layout:
         type: verticalBox
         fit-children: true
-
diff --git a/modules/game_battle/battlebutton.otui b/modules/game_battle/battlebutton.otui
index 67ff4ab9..48c9a8bf 100644
--- a/modules/game_battle/battlebutton.otui
+++ b/modules/game_battle/battlebutton.otui
@@ -1,7 +1,6 @@
 BattleButton < UIButton
   height: 20
-  margin-top: 5
-  margin-right: 4
+  margin-bottom: 5
   &isBattleButton: true
 
   UICreature
diff --git a/modules/game_healthinfo/healthinfo.lua b/modules/game_healthinfo/healthinfo.lua
index d36a2f54..280932ba 100644
--- a/modules/game_healthinfo/healthinfo.lua
+++ b/modules/game_healthinfo/healthinfo.lua
@@ -93,6 +93,13 @@ function toggle()
   end
 end
 
+function hideLabels()
+  capLabel:hide()
+  soulLabel:hide()
+  local removeHeight = capLabel:getHeight() + capLabel:getMarginTop() + capLabel:getMarginBottom()
+  healthInfoWindow:setHeight(healthInfoWindow:getHeight() - removeHeight)
+end
+
 function onMiniWindowClose()
   healthInfoButton:setOn(false)
 end
diff --git a/modules/game_healthinfo/healthinfo.otui b/modules/game_healthinfo/healthinfo.otui
index fb056691..3283149c 100644
--- a/modules/game_healthinfo/healthinfo.otui
+++ b/modules/game_healthinfo/healthinfo.otui
@@ -42,6 +42,7 @@ SoulLabel < GameLabel
   anchors.right: parent.right
   anchors.left: parent.horizontalCenter
   margin-top: 5
+  margin-right: 3
   text: Soul:
 
 CapLabel < GameLabel
@@ -52,6 +53,7 @@ CapLabel < GameLabel
   anchors.left: parent.left
   anchors.right: parent.horizontalCenter
   margin-top: 5
+  margin-left: 3
   text: Cap:
 
 ConditionWidget < UIWidget
diff --git a/modules/game_hotkeys/hotkeys_manager.otui b/modules/game_hotkeys/hotkeys_manager.otui
index 89c69c25..0f6ebdc0 100644
--- a/modules/game_hotkeys/hotkeys_manager.otui
+++ b/modules/game_hotkeys/hotkeys_manager.otui
@@ -38,7 +38,6 @@ MainWindow
     anchors.right: prev.left
     anchors.top: prev.top
     anchors.bottom: prev.bottom
-    margin-top: 2
     padding: 1
     focusable: false
 
@@ -160,6 +159,13 @@ MainWindow
     margin-top: 2
     @onCheckChange: modules.game_hotkeys.changeUseType(HOTKEY_MANAGER_USEWITH, self:isChecked())
 
+  HorizontalSeparator
+    id: separator
+    anchors.left: parent.left
+    anchors.right: parent.right
+    anchors.bottom: next.top
+    margin-bottom: 10
+
   Button
     !text: tr('Close')
     width: 64
diff --git a/modules/game_minimap/minimap.otui b/modules/game_minimap/minimap.otui
index 4774a9b2..d7d6aa07 100644
--- a/modules/game_minimap/minimap.otui
+++ b/modules/game_minimap/minimap.otui
@@ -39,7 +39,6 @@ MiniWindow
     size: 14 14
 
   MiniWindowContents
-    padding: 2
     UIMap
       id: minimap
       anchors.fill: parent
diff --git a/modules/game_questlog/questlinewindow.otui b/modules/game_questlog/questlinewindow.otui
index 0d05ced6..e4b22fd2 100644
--- a/modules/game_questlog/questlinewindow.otui
+++ b/modules/game_questlog/questlinewindow.otui
@@ -16,20 +16,19 @@ QuestLineWindow < MainWindow
 
   TextList
     id: missionList
-    anchors.fill: parent
-    anchors.bottom: none
-    width: 200
+    anchors.top: parent.top
+    anchors.left: parent.left
+    anchors.right: missionListScrollBar.left
     height: 200
     padding: 1
     focusable: false
-    margin-right: 20
     vertical-scrollbar: missionListScrollBar
 
   VerticalScrollBar
     id: missionListScrollBar
-    anchors.top: missionList.top
-    anchors.bottom: missionList.bottom
-    anchors.left: missionList.right
+    anchors.top: parent.top
+    anchors.right: parent.right
+    height: 200
     step: 14
     pixels-scroll: true
 
@@ -38,8 +37,8 @@ QuestLineWindow < MainWindow
     anchors.top: missionList.bottom
     anchors.left: parent.left
     anchors.right: missionListScrollBar.right
-    anchors.bottom: parent.bottom
-    margin-bottom: 30
+    anchors.bottom: closeButton.top
+    margin-bottom: 10
     margin-top: 10
     text-wrap: true
 
diff --git a/modules/game_skills/skills.otui b/modules/game_skills/skills.otui
index 9adc6e8a..d8bc8533 100644
--- a/modules/game_skills/skills.otui
+++ b/modules/game_skills/skills.otui
@@ -39,10 +39,12 @@ MiniWindow
   &save: true
 
   MiniWindowContents
-    anchors.fill: parent
+    padding-left: 5
+    padding-right: 5
     layout: verticalBox
 
     SkillButton
+      margin-top: 5
       id: experience
       height: 15
       SkillNameLabel
diff --git a/modules/game_viplist/viplist.otui b/modules/game_viplist/viplist.otui
index fc015ed8..bfb40c31 100644
--- a/modules/game_viplist/viplist.otui
+++ b/modules/game_viplist/viplist.otui
@@ -1,7 +1,11 @@
 VipListLabel < GameLabel
+  margin-top: 2
   font: verdana-11px-monochrome
   phantom: false
 
+  $first:
+    margin-top: 5
+
 MiniWindow
   id: vipWindow
   !text: tr('VIP List')
@@ -12,5 +16,6 @@ MiniWindow
 
   MiniWindowContents
     layout: verticalBox
-    anchors.fill: parent
+    padding-left: 5
+    padding-right: 5
     &onMousePress: modules.game_viplist.onVipListMousePress
diff --git a/src/otclient/mapio.cpp b/src/otclient/mapio.cpp
index d5099837..535ef047 100644
--- a/src/otclient/mapio.cpp
+++ b/src/otclient/mapio.cpp
@@ -515,7 +515,7 @@ bool Map::loadOtcm(const std::string& fileName)
 
         fin->close();
 
-        g_logger.debug(stdext::format("Otcm load time: %.2f seconds", loadTimer.elapsed_seconds()));
+        //g_logger.debug(stdext::format("Otcm load time: %.2f seconds", loadTimer.elapsed_seconds()));
         return true;
     } catch(stdext::exception& e) {
         g_logger.error(stdext::format("failed to load OTCM map: %s", e.what()));
diff --git a/src/otclient/uimap.cpp b/src/otclient/uimap.cpp
index 2e2e6444..69775484 100644
--- a/src/otclient/uimap.cpp
+++ b/src/otclient/uimap.cpp
@@ -192,4 +192,3 @@ void UIMap::updateMapSize()
     if(m_aspectRatio == 0.0f)
         updateVisibleDimension();
 }
-