diff --git a/modules/client_skins/skins/default/images/spinbox_down.png b/modules/client_skins/skins/default/images/spinbox_down.png
new file mode 100644
index 00000000..541abd86
Binary files /dev/null and b/modules/client_skins/skins/default/images/spinbox_down.png differ
diff --git a/modules/client_skins/skins/default/images/spinbox_up.png b/modules/client_skins/skins/default/images/spinbox_up.png
new file mode 100644
index 00000000..18e22529
Binary files /dev/null and b/modules/client_skins/skins/default/images/spinbox_up.png differ
diff --git a/modules/client_skins/skins/default/images/textedit.png b/modules/client_skins/skins/default/images/textedit.png
new file mode 100644
index 00000000..64a7b6aa
Binary files /dev/null and b/modules/client_skins/skins/default/images/textedit.png differ
diff --git a/modules/client_skins/skins/default/styles/spinboxes.otui b/modules/client_skins/skins/default/styles/spinboxes.otui
index 0fecee0c..b253ae1d 100644
--- a/modules/client_skins/skins/default/styles/spinboxes.otui
+++ b/modules/client_skins/skins/default/styles/spinboxes.otui
@@ -4,8 +4,38 @@ SpinBox < UISpinBox
   size: 86 20
   text-offset: 0 3
   text-margin: 3
-  image-source: /images/panel_flat.png
+  image-source: /images/textedit.png
   image-border: 1
 
   $disabled:
     color: #aaaaaa88
+
+  Button
+    id: up
+    size: 10 10
+    image-source: /images/spinbox_up.png
+    image-border: 1
+    image-clip: 0 0 10 10
+    anchors.top: parent.top
+    anchors.right: parent.right
+    @onClick: self:getParent():up()
+
+    $hover:
+      image-clip: 0 10 10 10
+    $pressed:
+      image-clip: 0 20 10 10
+
+  Button
+    id: down
+    size: 10 10
+    image-source: /images/spinbox_down.png
+    image-border: 1
+    image-clip: 0 0 10 10
+    anchors.bottom: parent.bottom
+    anchors.right: parent.right
+    @onClick: self:getParent():down()
+
+    $hover:
+      image-clip: 0 10 10 10
+    $pressed:
+      image-clip: 0 20 10 10
diff --git a/modules/client_skins/skins/default/styles/textedits.otui b/modules/client_skins/skins/default/styles/textedits.otui
index c70aa6d4..f0d064ad 100644
--- a/modules/client_skins/skins/default/styles/textedits.otui
+++ b/modules/client_skins/skins/default/styles/textedits.otui
@@ -4,7 +4,7 @@ TextEdit < UITextEdit
   size: 86 20
   text-offset: 0 3
   text-margin: 3
-  image-source: /images/panel_flat.png
+  image-source: /images/textedit.png
   image-border: 1
 
   $disabled:
diff --git a/modules/corelib/ui/uispinbox.lua b/modules/corelib/ui/uispinbox.lua
index 20aeb48f..5bdd51ec 100644
--- a/modules/corelib/ui/uispinbox.lua
+++ b/modules/corelib/ui/uispinbox.lua
@@ -13,9 +13,9 @@ end
 
 function UISpinBox:onMouseWheel(mousePos, direction)
   if direction == MouseWheelUp then
-    self:setValue(self.value + 1)
+    self:up()
   elseif direction == MouseWheelDown then
-    self:setValue(self.value - 1)
+    self:down()
   end
   return true
 end
@@ -59,6 +59,14 @@ function UISpinBox:onStyleApply(styleName, styleNode)
   end
 end
 
+function UISpinBox:up()
+  self:setValue(self.value + 1)
+end
+
+function UISpinBox:down()
+  self:setValue(self.value - 1)
+end
+
 function UISpinBox:setValue(value)
   value = math.max(math.min(self.maximum, value), self.minimum)
   if value == self.value then return end
diff --git a/modules/game_interface/styles/countwindow.otui b/modules/game_interface/styles/countwindow.otui
index 7f648052..0c51e9a1 100644
--- a/modules/game_interface/styles/countwindow.otui
+++ b/modules/game_interface/styles/countwindow.otui
@@ -1,17 +1,18 @@
 CountWindow < MainWindow
   id: countWindow
   !text: tr('Move Stackable Item')
-  size: 196 112
+  size: 196 122
 
   Label
     !text: tr('Amount:')
-    width: 64
+    text-auto-resize: true
     anchors.left: parent.left
     anchors.top: parent.top
     margin-top: 2
 
   SpinBox
     id: countSpinBox
+    margin-left: 5
     anchors.left: prev.right
     anchors.right: parent.right
     anchors.top: parent.top
diff --git a/src/otclient/mapio.cpp b/src/otclient/mapio.cpp
index 03e457ff..c6dc614b 100644
--- a/src/otclient/mapio.cpp
+++ b/src/otclient/mapio.cpp
@@ -515,7 +515,8 @@ bool Map::loadOtcm(const std::string& fileName)
 
         fin->close();
 
-        //g_logger.debug(stdext::format("Otcm load time: %.2f seconds", loadTimer.elapsed_seconds()));
+        // well, this is really slow
+        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()));