diff --git a/modules/core/core.otmod b/modules/core/core.otmod
index e73c7b05..c1691759 100644
--- a/modules/core/core.otmod
+++ b/modules/core/core.otmod
@@ -13,7 +13,6 @@ Module
     require 'constants'
     require 'util'
     require 'widget'
-    require 'ui'
     require 'messagebox/messagebox'
     require 'dispatcher'
 
diff --git a/modules/core_ui/styles/buttons.otui b/modules/core_ui/styles/buttons.otui
index ca0f282a..d249931e 100644
--- a/modules/core_ui/styles/buttons.otui
+++ b/modules/core_ui/styles/buttons.otui
@@ -3,6 +3,7 @@ Button < UIButton
   background-color: white
   color: #f0ad4dff
   size: 106 24
+  text-translate: 0 0
   border-image:
     source: /core_ui/images/button.png
     border: 5
diff --git a/modules/core_ui/styles/lineedits.otui b/modules/core_ui/styles/lineedits.otui
index 813e0a9b..5ff45246 100644
--- a/modules/core_ui/styles/lineedits.otui
+++ b/modules/core_ui/styles/lineedits.otui
@@ -1,7 +1,7 @@
 LineEdit < UILineEdit
   font: helvetica-12px
   size: 86 20
-  text-margin: 3
+  text margin: 3
   border-image:
     source: /core_ui/images/panel_flat.png
     border: 1
diff --git a/modules/core_ui/styles/windows.otui b/modules/core_ui/styles/windows.otui
index cb3f9868..a3a45378 100644
--- a/modules/core_ui/styles/windows.otui
+++ b/modules/core_ui/styles/windows.otui
@@ -3,21 +3,12 @@ Window < UIWindow
   size: 200 200
   opacity: 255
   background-color: white
-  head:
-    height: 20
-    border-image:
-      source: /core_ui/images/window.png
-      size: 256 19
-      border: 4
-      border.bottom: 3
-
-  body:
-    border-image:
-      source: /core_ui/images/window.png
-      size: 256 237
-      offset: 0 19
-      border: 4
-      border.top: 0
+  head height: 20
+  head text align: center
+  border-image:
+    source: /core_ui/images/window.png
+    border: 4
+    border.top: 20
 
   state.pressed:
     opacity: 192
diff --git a/modules/mainmenu/ui/entergamewindow.otui b/modules/mainmenu/ui/entergamewindow.otui
index 144f79f5..e5f6c6fa 100644
--- a/modules/mainmenu/ui/entergamewindow.otui
+++ b/modules/mainmenu/ui/entergamewindow.otui
@@ -52,4 +52,4 @@ MainWindow
     anchors.bottom: parent.bottom
     margin.bottom: 16
     margin.right: 16
-    onClick: function(self) GFX.fadeOut(self:getParent()) end
+    onClick: function(self) self:getParent():destroy() end