diff --git a/files/mygui/openmw_chargen_birth.layout b/files/mygui/openmw_chargen_birth.layout
index e8d959ba22..b368a6407c 100644
--- a/files/mygui/openmw_chargen_birth.layout
+++ b/files/mygui/openmw_chargen_birth.layout
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 485 378" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 491 378" name="_Main">
+
         <!-- Birthsign list -->
         <Widget type="ListBox" skin="MW_List" position="8 8 196 137" name="BirthsignList"/>
 
         <!-- Birthsign image -->
-        <Widget type="Widget" skin="MW_Box" position="206 8 263 137" align="Left Top">
+        <Widget type="Widget" skin="MW_Box" position="212 8 263 137" align="Left Top">
             <Widget type="ImageBox" skin="ImageBox" position="2 2 259 133" name="BirthsignImage" align="Left Top"/>
         </Widget>
 
@@ -13,7 +14,7 @@
         <Widget type="Widget" skin="" position="8 160 465 178" align="Left Top" name="SpellArea"/>
 
         <!-- Dialog buttons -->
-        <Widget type="HBox" position="0 338 469 24">
+        <Widget type="HBox" position="0 338 475 24">
             <Widget type="Widget">
                 <UserString key="HStretch" value="true"/>
             </Widget>
@@ -24,5 +25,6 @@
                 <Property key="Caption" value="OK"/>
             </Widget>
         </Widget>
+
     </Widget>
 </MyGUI>
diff --git a/files/mygui/openmw_chargen_class.layout b/files/mygui/openmw_chargen_class.layout
index aac97870c7..3c0348b663 100644
--- a/files/mygui/openmw_chargen_class.layout
+++ b/files/mygui/openmw_chargen_class.layout
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 484 316" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 478 316" name="_Main">
+
         <!-- Class list -->
         <Widget type="ListBox" skin="MW_List" position="8 8 181 138" name="ClassList"/>
 
@@ -20,6 +21,7 @@
                 <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>
@@ -32,6 +34,7 @@
                 <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"/>
 
@@ -40,6 +43,7 @@
                 <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"/>
@@ -51,6 +55,7 @@
                 <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"/>
@@ -60,7 +65,7 @@
         </Widget>
 
         <!-- Dialog buttons -->
-        <Widget type="HBox" position="0 276 468 24">
+        <Widget type="HBox" position="0 276 462 24">
             <Widget type="Widget">
                 <UserString key="HStretch" value="true"/>
             </Widget>
@@ -71,5 +76,6 @@
                 <Property key="Caption" value="#{sOK}"/>
             </Widget>
         </Widget>
+
     </Widget>
 </MyGUI>
diff --git a/files/mygui/openmw_chargen_class_description.layout b/files/mygui/openmw_chargen_class_description.layout
index e003f22c19..eaf754697d 100644
--- a/files/mygui/openmw_chargen_class_description.layout
+++ b/files/mygui/openmw_chargen_class_description.layout
@@ -17,6 +17,6 @@
             <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 e9c4146a0b..92382640b9 100644
--- a/files/mygui/openmw_chargen_create_class.layout
+++ b/files/mygui/openmw_chargen_create_class.layout
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 474 198" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 450 198" name="_Main">
 
         <!-- Class 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="72 8 387 23" name="EditName" align="HStretch Top"/>
+        <Widget type="EditBox" skin="MW_TextEdit" position="72 8 362 23" name="EditName" align="HStretch Top">
+            <Property key="Caption" value="#{sCustomClassName}"/>
+        </Widget>
 
         <Widget type="Widget" skin="" position="8 38 480 110" align="Stretch">
 
@@ -19,6 +21,7 @@
                 <UserString key="ToolTipLayout" value="TextToolTip"/>
                 <UserString key="Caption_Text" value="#{sCreateClassMenuHelp1}"/>
             </Widget>
+
             <Widget type="Button" skin="SandTextButton" position="0 18 156 18" name="SpecializationName" align="Left Top">
                 <Property key="TextAlign" value="Left Top"/>
             </Widget>
@@ -31,6 +34,7 @@
                 <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"/>
 
@@ -39,6 +43,7 @@
                 <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"/>
@@ -50,6 +55,7 @@
                 <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"/>
@@ -59,7 +65,7 @@
         </Widget>
 
         <!-- Dialog buttons -->
-        <Widget type="HBox" position="0 158 459 24">
+        <Widget type="HBox" position="0 158 434 24">
             <Widget type="Widget">
                 <UserString key="HStretch" value="true"/>
             </Widget>
@@ -73,6 +79,6 @@
                 <Property key="Caption" value="#{sOK}"/>
             </Widget>
         </Widget>
-        
+
     </Widget>
 </MyGUI>
diff --git a/files/mygui/openmw_chargen_review.layout b/files/mygui/openmw_chargen_review.layout
index 408d4f471e..5d18f4bff8 100644
--- a/files/mygui/openmw_chargen_review.layout
+++ b/files/mygui/openmw_chargen_review.layout
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 518 410" name="_Main">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 520 428" name="_Main">
 
-        <!-- Player name, race, class and birth sign-->
+        <!-- Player Name, Race, Class and Birthsign -->
         <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}"/>
@@ -17,27 +17,27 @@
             <Widget type="Button" skin="MW_Button" position="8 95 54 23" name="SignButton">
                 <Property key="Caption" value="#{sBirthSign}"/>
             </Widget>
-            <Widget type="TextBox" skin="SandTextRight" position="100 10 140 18" name="NameText"/>
-            <Widget type="TextBox" skin="SandTextRight" position="100 39 140 18" name="RaceText"/>
-            <Widget type="TextBox" skin="SandTextRight" position="100 68 140 18" name="ClassText"/>
-            <Widget type="TextBox" skin="SandTextRight" position="100 97 140 18" name="SignText"/>
+            <Widget type="TextBox" skin="SandTextRight" position="97 10 140 18" name="NameText"/>
+            <Widget type="TextBox" skin="SandTextRight" position="97 39 140 18" name="RaceText"/>
+            <Widget type="TextBox" skin="SandTextRight" position="97 68 140 18" name="ClassText"/>
+            <Widget type="TextBox" skin="SandTextRight" position="97 97 140 18" name="SignText"/>
         </Widget>
 
-        <!-- Player health, magicka and fatigue -->
-        <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">
+        <!-- Player Health, Magicka and Fatigue -->
+        <Widget type="Widget" skin="MW_Box" position="8 144 244 72">
+            <Widget type="MWDynamicStat" skin="MW_DynamicStat_Red" position="8 8 228 18" name="Health">
                 <UserString key="ToolTipType" value="Layout"/>
                 <UserString key="ToolTipLayout" value="HealthToolTip"/>
                 <UserString key="ImageTexture_HealthImage" value="icons\k\health.dds"/>
                 <Property key="Caption" value="#{sHealth}"/>
             </Widget>
-            <Widget type="MWDynamicStat" skin="MW_DynamicStat_Blue" position="4 22 236 18" name="Magicka">
+            <Widget type="MWDynamicStat" skin="MW_DynamicStat_Blue" position="8 27 228 18" name="Magicka">
                 <UserString key="ToolTipType" value="Layout"/>
                 <UserString key="ToolTipLayout" value="HealthToolTip"/>
                 <UserString key="ImageTexture_HealthImage" value="icons\k\magicka.dds"/>
                 <Property key="Caption" value="#{sMagic}"/>
             </Widget>
-            <Widget type="MWDynamicStat" skin="MW_DynamicStat_Green" position="4 40 236 18" name="Fatigue">
+            <Widget type="MWDynamicStat" skin="MW_DynamicStat_Green" position="8 46 228 18" name="Fatigue">
                 <UserString key="ToolTipType" value="Layout"/>
                 <UserString key="ToolTipLayout" value="HealthToolTip"/>
                 <UserString key="ImageTexture_HealthImage" value="icons\k\fatigue.dds"/>
@@ -46,57 +46,57 @@
         </Widget>
 
         <!-- Player attributes -->
-        <Widget type="Widget" skin="MW_Box" position="8 208 244 154">
-            <Widget type="MWAttribute" skin="MW_StatNameValue" position="4 4 236 18" name="Attribute0">
+        <Widget type="Widget" skin="MW_Box" position="8 224 244 156">
+            <Widget type="MWAttribute" skin="MW_StatNameValue" position="8 4 229 18" name="Attribute0">
                 <UserString key="ToolTipType" value="Layout"/>
                 <UserString key="ToolTipLayout" value="AttributeToolTip"/>
                 <UserString key="Caption_AttributeName" value="#{sAttributeStrength}"/>
                 <UserString key="Caption_AttributeDescription" value="#{sStrDesc}"/>
                 <UserString key="ImageTexture_AttributeImage" value="icons\k\attribute_strength.dds"/>
             </Widget>
-            <Widget type="MWAttribute" skin="MW_StatNameValue" position="4 22 236 18" name="Attribute1">
+            <Widget type="MWAttribute" skin="MW_StatNameValue" position="8 22 229 18" name="Attribute1">
                 <UserString key="ToolTipType" value="Layout"/>
                 <UserString key="ToolTipLayout" value="AttributeToolTip"/>
                 <UserString key="Caption_AttributeName" value="#{sAttributeIntelligence}"/>
                 <UserString key="Caption_AttributeDescription" value="#{sIntDesc}"/>
                 <UserString key="ImageTexture_AttributeImage" value="icons\k\attribute_int.dds"/>
             </Widget>
-            <Widget type="MWAttribute" skin="MW_StatNameValue" position="4 40 236 18" name="Attribute2">
+            <Widget type="MWAttribute" skin="MW_StatNameValue" position="8 40 229 18" name="Attribute2">
                 <UserString key="ToolTipType" value="Layout"/>
                 <UserString key="ToolTipLayout" value="AttributeToolTip"/>
                 <UserString key="Caption_AttributeName" value="#{sAttributeWillpower}"/>
                 <UserString key="Caption_AttributeDescription" value="#{sWilDesc}"/>
                 <UserString key="ImageTexture_AttributeImage" value="icons\k\attribute_wilpower.dds"/>
             </Widget>
-            <Widget type="MWAttribute" skin="MW_StatNameValue" position="4 58 236 18" name="Attribute3">
+            <Widget type="MWAttribute" skin="MW_StatNameValue" position="8 58 229 18" name="Attribute3">
                 <UserString key="ToolTipType" value="Layout"/>
                 <UserString key="ToolTipLayout" value="AttributeToolTip"/>
                 <UserString key="Caption_AttributeName" value="#{sAttributeAgility}"/>
                 <UserString key="Caption_AttributeDescription" value="#{sAgiDesc}"/>
                 <UserString key="ImageTexture_AttributeImage" value="icons\k\attribute_agility.dds"/>
             </Widget>
-            <Widget type="MWAttribute" skin="MW_StatNameValue" position="4 76 236 18" name="Attribute4">
+            <Widget type="MWAttribute" skin="MW_StatNameValue" position="8 76 229 18" name="Attribute4">
                 <UserString key="ToolTipType" value="Layout"/>
                 <UserString key="ToolTipLayout" value="AttributeToolTip"/>
                 <UserString key="Caption_AttributeName" value="#{sAttributeSpeed}"/>
                 <UserString key="Caption_AttributeDescription" value="#{sSpdDesc}"/>
                 <UserString key="ImageTexture_AttributeImage" value="icons\k\attribute_speed.dds"/>
             </Widget>
-            <Widget type="MWAttribute" skin="MW_StatNameValue" position="4 94 236 18" name="Attribute5">
+            <Widget type="MWAttribute" skin="MW_StatNameValue" position="8 94 229 18" name="Attribute5">
                 <UserString key="ToolTipType" value="Layout"/>
                 <UserString key="ToolTipLayout" value="AttributeToolTip"/>
                 <UserString key="Caption_AttributeName" value="#{sAttributeEndurance}"/>
                 <UserString key="Caption_AttributeDescription" value="#{sEndDesc}"/>
                 <UserString key="ImageTexture_AttributeImage" value="icons\k\attribute_endurance.dds"/>
             </Widget>
-            <Widget type="MWAttribute" skin="MW_StatNameValue" position="4 112 236 18" name="Attribute6">
+            <Widget type="MWAttribute" skin="MW_StatNameValue" position="8 112 229 18" name="Attribute6">
                 <UserString key="ToolTipType" value="Layout"/>
                 <UserString key="ToolTipLayout" value="AttributeToolTip"/>
                 <UserString key="Caption_AttributeName" value="#{sAttributePersonality}"/>
                 <UserString key="Caption_AttributeDescription" value="#{sPerDesc}"/>
                 <UserString key="ImageTexture_AttributeImage" value="icons\k\attribute_personality.dds"/>
             </Widget>
-            <Widget type="MWAttribute" skin="MW_StatNameValue" position="4 130 236 18" name="Attribute7">
+            <Widget type="MWAttribute" skin="MW_StatNameValue" position="8 130 229 18" name="Attribute7">
                 <UserString key="ToolTipType" value="Layout"/>
                 <UserString key="ToolTipLayout" value="AttributeToolTip"/>
                 <UserString key="Caption_AttributeName" value="#{sAttributeLuck}"/>
@@ -105,13 +105,13 @@
             </Widget>
         </Widget>
 
-        <!-- Player skills, factions, birthsign and reputation -->
-        <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"/>
+        <!-- Player Skills -->
+        <Widget type="Widget" skin="MW_Box" position="260 7 244 372" align="Left VStretch" name="Skills">
+            <Widget type="ScrollView" skin="MW_ScrollView" position="8 6 232 362" align="Stretch" name="SkillView"/>
         </Widget>
 
-        <!-- Dialog buttons -->
-        <Widget type="HBox" position="0 370 502 24">
+        <!-- Dialogue Buttons -->
+        <Widget type="HBox" position="0 388 504 24">
             <Widget type="Widget">
                 <UserString key="HStretch" value="true"/>
             </Widget>