diff --git a/files/mygui/openmw_chargen_birth.layout b/files/mygui/openmw_chargen_birth.layout
index 75f741271..e8d959ba2 100644
--- a/files/mygui/openmw_chargen_birth.layout
+++ b/files/mygui/openmw_chargen_birth.layout
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 485 375" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 485 378" name="_Main">
         <!-- Birthsign list -->
-        <Widget type="ListBox" skin="MW_List" position="8 13 196 137" name="BirthsignList" />
+        <Widget type="ListBox" skin="MW_List" position="8 8 196 137" name="BirthsignList"/>
 
         <!-- Birthsign image -->
-        <Widget type="Widget" skin="MW_Box" position="206 13 263 137" align="Left Top">
-            <Widget type="ImageBox" skin="ImageBox" position="2 2 259 133" name="BirthsignImage" align="Left Top" />
+        <Widget type="Widget" skin="MW_Box" position="206 8 263 137" align="Left Top">
+            <Widget type="ImageBox" skin="ImageBox" position="2 2 259 133" name="BirthsignImage" align="Left Top"/>
         </Widget>
 
         <!-- Spell list -->
-        <Widget type="Widget" skin="" position="8 160 465 178" align="Left Top" name="SpellArea">
-        </Widget>
+        <Widget type="Widget" skin="" position="8 160 465 178" align="Left Top" name="SpellArea"/>
 
         <!-- Dialog buttons -->
-        <Widget type="HBox" position="0 340 473 24">
+        <Widget type="HBox" position="0 338 469 24">
             <Widget type="Widget">
                 <UserString key="HStretch" value="true"/>
             </Widget>
diff --git a/files/mygui/openmw_chargen_class.layout b/files/mygui/openmw_chargen_class.layout
index 6d159fe61..aac97870c 100644
--- a/files/mygui/openmw_chargen_class.layout
+++ b/files/mygui/openmw_chargen_class.layout
@@ -1,66 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 491 302" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 484 316" name="_Main">
         <!-- Class list -->
-        <Widget type="ListBox" skin="MW_List" position="14 13 181 131" name="ClassList" />
+        <Widget type="ListBox" skin="MW_List" position="8 8 181 138" name="ClassList"/>
 
         <!-- Class image -->
-        <Widget type="Widget" skin="MW_Box" position="212 9 265 138" align="Left Top">
-            <Widget type="ImageBox" skin="ImageBox" position="2 2 261 134" name="ClassImage" align="Left Top" />
+        <Widget type="Widget" skin="MW_Box" position="197 8 265 138" align="Left Top">
+            <Widget type="ImageBox" skin="ImageBox" position="2 2 261 134" name="ClassImage" align="Left Top"/>
         </Widget>
 
         <!-- Specialization -->
-        <Widget type="Widget" skin="" position="15 152 484 178" align="Left Top">
+        <Widget type="Widget" skin="" position="15 156 484 178" align="Left Top">
 
-        <Widget type="TextBox" skin="HeaderText" position="0 0 162 18" name="SpecializationT" align="Left Top">
-            <Property key="Caption" value="#{sChooseClassMenu1}"/>
-            <Property key="TextAlign" value="Left Top"/>
-            <UserString key="ToolTipType" value="Layout"/>
-            <UserString key="ToolTipLayout" value="TextToolTip"/>
-            <UserString key="Caption_Text" value="#{sCreateClassMenuHelp1}"/>
-        </Widget>
-        <Widget type="TextBox" skin="SandText" position="0 18 162 18" name="SpecializationName" align="Left Top">
-            <Property key="TextAlign" value="Left Top"/>
-        </Widget>
+            <Widget type="TextBox" skin="HeaderText" position="0 0 162 18" name="SpecializationT" align="Left Top">
+                <Property key="Caption" value="#{sChooseClassMenu1}"/>
+                <Property key="TextAlign" value="Left Top"/>
+                <UserString key="ToolTipType" value="Layout"/>
+                <UserString key="ToolTipLayout" value="TextToolTip"/>
+                <UserString key="Caption_Text" value="#{sCreateClassMenuHelp1}"/>
+            </Widget>
+            <Widget type="TextBox" skin="SandText" position="0 18 162 18" name="SpecializationName" align="Left Top">
+                <Property key="TextAlign" value="Left Top"/>
+            </Widget>
 
-        <!-- Favorite Attributes -->
-        <Widget type="TextBox" skin="HeaderText" position="0 41 162 18" name="FavoriteAttributesT" align="Left Top">
-            <Property key="Caption" value="#{sChooseClassMenu2}"/>
-            <Property key="TextAlign" value="Left Top"/>
-            <UserString key="ToolTipType" value="Layout"/>
-            <UserString key="ToolTipLayout" value="TextToolTip"/>
-            <UserString key="Caption_Text" value="#{sCreateClassMenuHelp2}"/>
-        </Widget>
-        <Widget type="MWAttribute" skin="MW_StatName" position="0 59 162 18" name="FavoriteAttribute0" align="Left Top" />
-        <Widget type="MWAttribute" skin="MW_StatName" position="0 77 162 18" name="FavoriteAttribute1" align="Left Top" />
+            <!-- Favorite Attributes -->
+            <Widget type="TextBox" skin="HeaderText" position="0 41 162 18" name="FavoriteAttributesT" align="Left Top">
+                <Property key="Caption" value="#{sChooseClassMenu2}"/>
+                <Property key="TextAlign" value="Left Top"/>
+                <UserString key="ToolTipType" value="Layout"/>
+                <UserString key="ToolTipLayout" value="TextToolTip"/>
+                <UserString key="Caption_Text" value="#{sCreateClassMenuHelp2}"/>
+            </Widget>
+            <Widget type="MWAttribute" skin="MW_StatName" position="0 59 162 18" name="FavoriteAttribute0" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatName" position="0 77 162 18" name="FavoriteAttribute1" align="Left Top"/>
 
-        <!-- Major Skills -->
-        <Widget type="TextBox" skin="HeaderText" position="162 0 162 18" name="MajorSkillT" align="Left Top">
-            <Property key="TextAlign" value="Left Top"/>
-            <Property key="Caption" value="#{sChooseClassMenu3}"/>
-        </Widget>
-        <Widget type="MWSkill" skin="MW_StatName" position="162 18 162 18" name="MajorSkill0" align="Left Top" />
-        <Widget type="MWSkill" skin="MW_StatName" position="162 36 162 18" name="MajorSkill1" align="Left Top" />
-        <Widget type="MWSkill" skin="MW_StatName" position="162 54 162 18" name="MajorSkill2" align="Left Top" />
-        <Widget type="MWSkill" skin="MW_StatName" position="162 72 162 18" name="MajorSkill3" align="Left Top" />
-        <Widget type="MWSkill" skin="MW_StatName" position="162 90 162 18" name="MajorSkill4" align="Left Top" />
+            <!-- Major Skills -->
+            <Widget type="TextBox" skin="HeaderText" position="162 0 162 18" name="MajorSkillT" align="Left Top">
+                <Property key="TextAlign" value="Left Top"/>
+                <Property key="Caption" value="#{sChooseClassMenu3}"/>
+            </Widget>
+            <Widget type="MWSkill" skin="MW_StatName" position="162 18 162 18" name="MajorSkill0" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatName" position="162 36 162 18" name="MajorSkill1" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatName" position="162 54 162 18" name="MajorSkill2" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatName" position="162 72 162 18" name="MajorSkill3" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatName" position="162 90 162 18" name="MajorSkill4" align="Left Top"/>
 
-        <!-- Minor Skills -->
-        <Widget type="TextBox" skin="HeaderText" position="325 0 162 18" name="MinorSkillT" align="Left Top">
-            <Property key="Caption" value="#{sChooseClassMenu4}"/>
-            <Property key="TextAlign" value="Left Top"/>
-        </Widget>
-        <Widget type="MWSkill" skin="MW_StatName" position="325 18 162 18" name="MinorSkill0" align="Left Top" />
-        <Widget type="MWSkill" skin="MW_StatName" position="325 36 162 18" name="MinorSkill1" align="Left Top" />
-        <Widget type="MWSkill" skin="MW_StatName" position="325 54 162 18" name="MinorSkill2" align="Left Top" />
-        <Widget type="MWSkill" skin="MW_StatName" position="325 72 162 18" name="MinorSkill3" align="Left Top" />
-        <Widget type="MWSkill" skin="MW_StatName" position="325 90 162 18" name="MinorSkill4" align="Left Top" />
+            <!-- Minor Skills -->
+            <Widget type="TextBox" skin="HeaderText" position="325 0 162 18" name="MinorSkillT" align="Left Top">
+                <Property key="Caption" value="#{sChooseClassMenu4}"/>
+                <Property key="TextAlign" value="Left Top"/>
+            </Widget>
+            <Widget type="MWSkill" skin="MW_StatName" position="325 18 162 18" name="MinorSkill0" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatName" position="325 36 162 18" name="MinorSkill1" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatName" position="325 54 162 18" name="MinorSkill2" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatName" position="325 72 162 18" name="MinorSkill3" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatName" position="325 90 162 18" name="MinorSkill4" align="Left Top"/>
 
         </Widget>
 
         <!-- Dialog buttons -->
-        <Widget type="HBox" position="0 265 476 24">
+        <Widget type="HBox" position="0 276 468 24">
             <Widget type="Widget">
                 <UserString key="HStretch" value="true"/>
             </Widget>
diff --git a/files/mygui/openmw_chargen_class_description.layout b/files/mygui/openmw_chargen_class_description.layout
index 7050f1e3e..e003f22c1 100644
--- a/files/mygui/openmw_chargen_class_description.layout
+++ b/files/mygui/openmw_chargen_class_description.layout
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 249 249" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 244 248" name="_Main">
 
         <!-- Edit box -->
+        <Widget type="Widget" skin="MW_Box" position="8 8 220 192" align="Stretch" name="Client"/>
 
-        <Widget type="Widget" skin="MW_Box" position="14 14 220 192" align="Stretch" name="Client"/>
-
-        <Widget type="EditBox" skin="MW_TextBoxEdit" position="14 14 220 192" name="TextEdit" align="Left Top Stretch">
-            <Property key="MultiLine" value="1" />
-            <Property key="VisibleVScroll" value="1" />
-            <Property key="WordWrap" value="1" />
+        <Widget type="EditBox" skin="MW_TextBoxEdit" position="10 10 218 190" name="TextEdit" align="Left Top Stretch">
+            <Property key="MultiLine" value="true"/>
+            <Property key="VisibleVScroll" value="true"/>
+            <Property key="WordWrap" value="true"/>
         </Widget>
 
         <!-- Dialog buttons -->
-        <Widget type="AutoSizedButton" skin="MW_Button" position="177 214 57 24" name="OKButton">
+        <Widget type="AutoSizedButton" skin="MW_Button" position="171 208 57 24" name="OKButton">
             <Property key="ExpandDirection" value="Left"/>
             <Property key="Caption" value="Enter"/>
         </Widget>
+        
     </Widget>
 </MyGUI>
diff --git a/files/mygui/openmw_chargen_create_class.layout b/files/mygui/openmw_chargen_create_class.layout
index 9677f438f..e9c4146a0 100644
--- a/files/mygui/openmw_chargen_create_class.layout
+++ b/files/mygui/openmw_chargen_create_class.layout
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 474 192" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 474 198" name="_Main">
+
         <!-- Class name -->
-        <Widget type="TextBox" skin="ProgressText" position="12 12 48 30" name="LabelT" align="Left Top">
-            <Property key="Caption" value="Name"/>
+        <Widget type="TextBox" skin="ProgressText" position="8 8 48 23" name="LabelT" align="Left Top">
+            <Property key="Caption" value="#{sName}"/>
             <Property key="TextAlign" value="Left VCenter"/>
         </Widget>
-        <Widget type="EditBox" skin="MW_TextEdit" position="62 12 250 30" name="EditName" align="HStretch Top"/>
+        <Widget type="EditBox" skin="MW_TextEdit" position="72 8 387 23" name="EditName" align="HStretch Top"/>
 
-        <Widget type="Widget" skin="" position="12 46 480 110" align="Stretch">
+        <Widget type="Widget" skin="" position="8 38 480 110" align="Stretch">
 
             <!-- Specialization -->
             <Widget type="TextBox" skin="HeaderText" position="0 0 156 18" name="SpecializationT" align="Left Top">
@@ -30,30 +31,30 @@
                 <UserString key="ToolTipLayout" value="TextToolTip"/>
                 <UserString key="Caption_Text" value="#{sCreateClassMenuHelp2}"/>
             </Widget>
-            <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 59 156 18" name="FavoriteAttribute0" align="Left Top" />
-            <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 77 156 18" name="FavoriteAttribute1" align="Left Top" />
+            <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 59 156 18" name="FavoriteAttribute0" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 77 156 18" name="FavoriteAttribute1" align="Left Top"/>
 
             <!-- Major Skills -->
             <Widget type="TextBox" skin="HeaderText" position="156 0 158 18" name="MajorSkillT" align="Left Top">
                 <Property key="Caption" value="Major Skills:"/>
                 <Property key="TextAlign" value="Left Top"/>
             </Widget>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 18 158 18" name="MajorSkill0" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 36 158 18" name="MajorSkill1" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 54 158 18" name="MajorSkill2" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 72 158 18" name="MajorSkill3" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 90 158 18" name="MajorSkill4" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 18 158 18" name="MajorSkill0" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 36 158 18" name="MajorSkill1" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 54 158 18" name="MajorSkill2" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 72 158 18" name="MajorSkill3" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="156 90 158 18" name="MajorSkill4" align="Left Top"/>
 
             <!-- Minor Skills -->
             <Widget type="TextBox" skin="HeaderText" position="314 0 140 18" name="MinorSkillT" align="Left Top">
                 <Property key="Caption" value="Minor Skills:"/>
                 <Property key="TextAlign" value="Left Top"/>
             </Widget>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 18 140 18" name="MinorSkill0" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 36 140 18" name="MinorSkill1" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 54 140 18" name="MinorSkill2" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 72 140 18" name="MinorSkill3" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 90 140 18" name="MinorSkill4" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 18 140 18" name="MinorSkill0" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 36 140 18" name="MinorSkill1" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 54 140 18" name="MinorSkill2" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 72 140 18" name="MinorSkill3" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="314 90 140 18" name="MinorSkill4" align="Left Top"/>
 
         </Widget>
 
@@ -72,5 +73,6 @@
                 <Property key="Caption" value="#{sOK}"/>
             </Widget>
         </Widget>
+        
     </Widget>
 </MyGUI>
diff --git a/files/mygui/openmw_chargen_generate_class_result.layout b/files/mygui/openmw_chargen_generate_class_result.layout
index 9ee3e0701..f7178042f 100644
--- a/files/mygui/openmw_chargen_generate_class_result.layout
+++ b/files/mygui/openmw_chargen_generate_class_result.layout
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 330 256" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 289 256" name="_Main">
         <!-- Class image -->
-        <Widget type="Widget" skin="MW_Box" position="32 10 265 138" align="Left Top">
-            <Widget type="ImageBox" skin="ImageBox" position="2 2 261 134" name="ClassImage" align="Left Top" />
+        <Widget type="Widget" skin="MW_Box" position="8 8 265 138" align="Left Top">
+            <Widget type="ImageBox" skin="ImageBox" position="2 2 261 134" name="ClassImage" align="Left Top"/>
         </Widget>
 
         <!-- Class text -->
-        <Widget type="EditBox" skin="SandText" position="32 152 265 40" name="ReflectT" align="Left Top">
+        <Widget type="EditBox" skin="SandText" position="8 152 265 40" name="ReflectT" align="Left Top">
             <Property key="TextAlign" value="Top HCenter"/>
             <Property key="MultiLine" value="true"/>
             <Property key="WordWrap" value="true"/>
             <Property key="Static" value="true"/>
         </Widget>
-        <Widget type="TextBox" skin="SandText" position="32 192 265 23" name="ClassName" align="Left Top">
+        <Widget type="TextBox" skin="SandText" position="8 183 265 23" name="ClassName" align="Left Top">
             <Property key="Caption" value="[Class]"/>
             <Property key="TextAlign" value="Top HCenter"/>
         </Widget>
 
         <!-- Dialog buttons -->
-        <Widget type="HBox" position="0 219 319 24">
+        <Widget type="HBox" position="0 216 273 24">
             <Widget type="Widget">
                 <UserString key="HStretch" value="true"/>
             </Widget>
diff --git a/files/mygui/openmw_chargen_race.layout b/files/mygui/openmw_chargen_race.layout
index 0f63ba700..1290795ed 100644
--- a/files/mygui/openmw_chargen_race.layout
+++ b/files/mygui/openmw_chargen_race.layout
@@ -9,7 +9,7 @@
             <Property key="TextAlign" value="Left Top"/>
         </Widget>
         <Widget type="Widget" skin="MW_Box" position="8 39 241 220">
-            <Widget type="ImageBox" skin="ImageBox" position_real="0 0 1 1" align="Stretch" name="PreviewImage"/>
+            <Widget type="ImageBox" skin="ImageBox" position="2 2 237 216" align="Stretch" name="PreviewImage"/>
         </Widget>
 
         <!-- Sliders -->
@@ -22,7 +22,7 @@
             <Widget type="Button" skin="MW_ArrowLeft" position="3 2 10 10" align="Left VStretch" name="PrevGenderButton"/>
         </Widget>
 
-        <Widget type="TextBox" skin="HeaderText" position="25 294 205 18" name="GenderChoiceT" />
+        <Widget type="TextBox" skin="HeaderText" position="25 294 205 18" name="GenderChoiceT"/>
 
         <Widget type="Widget" skin="MW_Box" position="234 298 15 14">
             <Widget type="Button" skin="MW_ArrowRight" position="1 2 10 10" align="Right VStretch" name="NextGenderButton"/>
@@ -34,7 +34,7 @@
             <Widget type="Button" skin="MW_ArrowLeft" position="3 2 10 10" align="Left VStretch" name="PrevFaceButton"/>
         </Widget>
 
-        <Widget type="TextBox" skin="HeaderText" position="25 316 205 18" name="FaceChoiceT" />
+        <Widget type="TextBox" skin="HeaderText" position="25 316 205 18" name="FaceChoiceT"/>
 
         <Widget type="Widget" skin="MW_Box" position="234 320 15 14">
             <Widget type="Button" skin="MW_ArrowRight" position="1 2 10 10" align="Right VStretch" name="NextFaceButton"/>
@@ -46,7 +46,7 @@
             <Widget type="Button" skin="MW_ArrowLeft" position="3 2 10 10" align="Left VStretch" name="PrevHairButton"/>
         </Widget>
 
-        <Widget type="TextBox" skin="HeaderText" position="25 338 205 18" name="HairChoiceT" />
+        <Widget type="TextBox" skin="HeaderText" position="25 338 205 18" name="HairChoiceT"/>
 
         <Widget type="Widget" skin="MW_Box" position="234 342 15 14">
             <Widget type="Button" skin="MW_ArrowRight" position="1 2 10 10" align="Right VStretch" name="NextHairButton"/>
@@ -65,17 +65,17 @@
             <Property key="TextAlign" value="Left Top"/>
         </Widget>
         <!-- Spell power sub-widgets will be placed here, no skin to make it invisible -->
-        <Widget type="Widget" skin="" position="261 230 250 140" name="SpellPowerList" />
+        <Widget type="Widget" skin="" position="261 230 250 140" name="SpellPowerList"/>
 
         <!-- Skill bonus -->
         <Widget type="TextBox" skin="HeaderText" position="403 39 159 18" name="SkillsT" align="Left Top">
             <Property key="TextAlign" value="Left Top"/>
         </Widget>
         <!-- Skill bonus sub-widgets will be placed here, no skin to make it invisible -->
-        <Widget type="Widget" skin="" position="403 59 159 360" name="SkillList" />
+        <Widget type="Widget" skin="" position="403 59 159 360" name="SkillList"/>
 
         <!-- Dialog buttons -->
-        <Widget type="HBox" position="0 397 574 24">
+        <Widget type="HBox" position="0 393 572 24">
             <Widget type="Widget">
                 <UserString key="HStretch" value="true"/>
             </Widget>
diff --git a/files/mygui/openmw_chargen_review.layout b/files/mygui/openmw_chargen_review.layout
index 84b105bd0..408d4f471 100644
--- a/files/mygui/openmw_chargen_review.layout
+++ b/files/mygui/openmw_chargen_review.layout
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 520 409" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 518 410" name="_Main">
 
         <!-- Player name, race, class and birth sign-->
-        <Widget type="Widget" skin="MW_Box" position="8 12 244 126">
+        <Widget type="Widget" skin="MW_Box" position="8 8 244 126">
             <Widget type="Button" skin="MW_Button" position="8 8 64 23" name="NameButton">
                 <Property key="Caption" value="#{sName}"/>
             </Widget>
@@ -24,7 +24,7 @@
         </Widget>
 
         <!-- Player health, magicka and fatigue -->
-        <Widget type="Widget" skin="MW_Box" position="8 144 244 64">
+        <Widget type="Widget" skin="MW_Box" position="8 136 244 64">
             <Widget type="MWDynamicStat" skin="MW_DynamicStat_Red" position="4 4 236 18" name="Health">
                 <UserString key="ToolTipType" value="Layout"/>
                 <UserString key="ToolTipLayout" value="HealthToolTip"/>
@@ -46,7 +46,7 @@
         </Widget>
 
         <!-- Player attributes -->
-        <Widget type="Widget" skin="MW_Box" position="8 214 244 154">
+        <Widget type="Widget" skin="MW_Box" position="8 208 244 154">
             <Widget type="MWAttribute" skin="MW_StatNameValue" position="4 4 236 18" name="Attribute0">
                 <UserString key="ToolTipType" value="Layout"/>
                 <UserString key="ToolTipLayout" value="AttributeToolTip"/>
@@ -106,12 +106,12 @@
         </Widget>
 
         <!-- Player skills, factions, birthsign and reputation -->
-        <Widget type="Widget" skin="MW_Box" position="258 12 244 356" align="Left VStretch" name="Skills">
-            <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 236 346" align="Stretch" name="SkillView" />
+        <Widget type="Widget" skin="MW_Box" position="258 8 244 354" align="Left VStretch" name="Skills">
+            <Widget type="ScrollView" skin="MW_ScrollView" position="4 4 236 346" align="Stretch" name="SkillView"/>
         </Widget>
 
         <!-- Dialog buttons -->
-        <Widget type="HBox" position="0 372 502 24">
+        <Widget type="HBox" position="0 370 502 24">
             <Widget type="Widget">
                 <UserString key="HStretch" value="true"/>
             </Widget>
diff --git a/files/mygui/openmw_chargen_select_attribute.layout b/files/mygui/openmw_chargen_select_attribute.layout
index b847bcd3b..f0f72bb0f 100644
--- a/files/mygui/openmw_chargen_select_attribute.layout
+++ b/files/mygui/openmw_chargen_select_attribute.layout
@@ -10,14 +10,14 @@
             </Widget>
 
             <!-- Attribute list -->
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 28 186 18" name="Attribute0" align="Left Top" />
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 46 186 18" name="Attribute1" align="Left Top" />
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 64 186 18" name="Attribute2" align="Left Top" />
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 82 186 18" name="Attribute3" align="Left Top" />
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 100 186 18" name="Attribute4" align="Left Top" />
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 118 186 18" name="Attribute5" align="Left Top" />
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 136 186 18" name="Attribute6" align="Left Top" />
-            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 154 186 18" name="Attribute7" align="Left Top" />
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 28 186 18" name="Attribute0" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 46 186 18" name="Attribute1" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 64 186 18" name="Attribute2" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 82 186 18" name="Attribute3" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 100 186 18" name="Attribute4" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 118 186 18" name="Attribute5" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 136 186 18" name="Attribute6" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 154 186 18" name="Attribute7" align="Left Top"/>
 
             <!-- Dialog buttons -->
             <Widget type="AutoSizedButton" skin="MW_Button" position="120 180 66 21" name="CancelButton">
diff --git a/files/mygui/openmw_chargen_select_skill.layout b/files/mygui/openmw_chargen_select_skill.layout
index 90ae477e5..dc1798995 100644
--- a/files/mygui/openmw_chargen_select_skill.layout
+++ b/files/mygui/openmw_chargen_select_skill.layout
@@ -14,45 +14,45 @@
                 <Property key="Caption" value="Combat"/>
                 <Property key="TextAlign" value="Left Top"/>
             </Widget>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 50 154 18" name="CombatSkill0" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 68 154 18" name="CombatSkill1" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 86 154 18" name="CombatSkill2" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 104 154 18" name="CombatSkill3" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 122 154 18" name="CombatSkill4" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 140 154 18" name="CombatSkill5" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 158 154 18" name="CombatSkill6" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 176 154 18" name="CombatSkill7" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 194 154 18" name="CombatSkill8" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 50 154 18" name="CombatSkill0" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 68 154 18" name="CombatSkill1" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 86 154 18" name="CombatSkill2" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 104 154 18" name="CombatSkill3" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 122 154 18" name="CombatSkill4" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 140 154 18" name="CombatSkill5" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 158 154 18" name="CombatSkill6" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 176 154 18" name="CombatSkill7" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="0 194 154 18" name="CombatSkill8" align="Left Top"/>
 
             <!-- Magic list -->
             <Widget type="TextBox" skin="HeaderText" position="158 32 154 18" name="MagicLabelT" align="Left Top">
                 <Property key="Caption" value="Magic"/>
                 <Property key="TextAlign" value="Left Top"/>
             </Widget>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 50 154 18" name="MagicSkill0" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 68 154 18" name="MagicSkill1" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 86 154 18" name="MagicSkill2" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 104 154 18" name="MagicSkill3" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 122 154 18" name="MagicSkill4" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 140 154 18" name="MagicSkill5" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 158 154 18" name="MagicSkill6" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 176 154 18" name="MagicSkill7" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 194 154 18" name="MagicSkill8" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 50 154 18" name="MagicSkill0" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 68 154 18" name="MagicSkill1" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 86 154 18" name="MagicSkill2" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 104 154 18" name="MagicSkill3" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 122 154 18" name="MagicSkill4" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 140 154 18" name="MagicSkill5" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 158 154 18" name="MagicSkill6" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 176 154 18" name="MagicSkill7" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="158 194 154 18" name="MagicSkill8" align="Left Top"/>
 
             <!-- Stealth list -->
             <Widget type="TextBox" skin="HeaderText" position="316 32 131 18" name="StealthLabelT" align="Left Top">
                 <Property key="Caption" value="Stealth"/>
                 <Property key="TextAlign" value="Left Top"/>
             </Widget>
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 50 131 18" name="StealthSkill0" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 68 131 18" name="StealthSkill1" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 86 131 18" name="StealthSkill2" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 104 131 18" name="StealthSkill3" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 122 131 18" name="StealthSkill4" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 140 131 18" name="StealthSkill5" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 158 131 18" name="StealthSkill6" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 176 131 18" name="StealthSkill7" align="Left Top" />
-            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 194 131 18" name="StealthSkill8" align="Left Top" />
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 50 131 18" name="StealthSkill0" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 68 131 18" name="StealthSkill1" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 86 131 18" name="StealthSkill2" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 104 131 18" name="StealthSkill3" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 122 131 18" name="StealthSkill4" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 140 131 18" name="StealthSkill5" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 158 131 18" name="StealthSkill6" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 176 131 18" name="StealthSkill7" align="Left Top"/>
+            <Widget type="MWSkill" skin="MW_StatNameButton" position="316 194 131 18" name="StealthSkill8" align="Left Top"/>
 
             <!-- Dialog buttons -->
             <Widget type="AutoSizedButton" skin="MW_Button" position="381 218 66 21" name="CancelButton">