diff --git a/apps/openmw/mwgui/levelupdialog.cpp b/apps/openmw/mwgui/levelupdialog.cpp
index 1434455b2..362ad3b1c 100644
--- a/apps/openmw/mwgui/levelupdialog.cpp
+++ b/apps/openmw/mwgui/levelupdialog.cpp
@@ -89,7 +89,7 @@ namespace MWGui
 
     void LevelupDialog::resetCoins()
     {
-        const int coinSpacing = 10;
+        const int coinSpacing = 33;
         int curX = mCoinBox->getWidth()/2 - (coinSpacing*(mCoinCount - 1) + 16*mCoinCount)/2;
         for (unsigned int i=0; i<sMaxCoins; ++i)
         {
diff --git a/apps/openmw/mwgui/recharge.cpp b/apps/openmw/mwgui/recharge.cpp
index afca12ad9..f97d8dbf8 100644
--- a/apps/openmw/mwgui/recharge.cpp
+++ b/apps/openmw/mwgui/recharge.cpp
@@ -33,6 +33,7 @@ namespace MWGui
 
 Recharge::Recharge()
     : WindowBase("openmw_recharge_dialog.layout")
+    , mItemSelectionDialog(NULL)
 {
     getWidget(mBox, "Box");
     getWidget(mGemBox, "GemBox");
@@ -45,6 +46,8 @@ Recharge::Recharge()
 
     mBox->setDisplayMode(ItemChargeView::DisplayMode_EnchantmentCharge);
 
+    mGemIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &Recharge::onSelectItem);
+
     setVisible(false);
 }
 
@@ -87,6 +90,12 @@ void Recharge::updateView()
     mGemBox->setVisible(toolBoxVisible);
     mGemBox->setUserString("Hidden", toolBoxVisible ? "false" : "true");
 
+    if (!toolBoxVisible)
+    {
+        mGemIcon->setItem(MWWorld::Ptr());
+        mGemIcon->clearUserStrings();
+    }
+
     mBox->update();
 
     Gui::Box* box = dynamic_cast<Gui::Box*>(mMainWidget);
@@ -102,6 +111,34 @@ void Recharge::onCancel(MyGUI::Widget *sender)
     exit();
 }
 
+void Recharge::onSelectItem(MyGUI::Widget *sender)
+{
+    delete mItemSelectionDialog;
+    mItemSelectionDialog = new ItemSelectionDialog("#{sSoulGemsWithSouls}");
+    mItemSelectionDialog->eventItemSelected += MyGUI::newDelegate(this, &Recharge::onItemSelected);
+    mItemSelectionDialog->eventDialogCanceled += MyGUI::newDelegate(this, &Recharge::onItemCancel);
+    mItemSelectionDialog->setVisible(true);
+    mItemSelectionDialog->openContainer(MWMechanics::getPlayer());
+    mItemSelectionDialog->setFilter(SortFilterItemModel::Filter_OnlyChargedSoulstones);
+}
+
+void Recharge::onItemSelected(MWWorld::Ptr item)
+{
+    mItemSelectionDialog->setVisible(false);
+
+    mGemIcon->setItem(item);
+    mGemIcon->setUserString ("ToolTipType", "ItemPtr");
+    mGemIcon->setUserData(item);
+
+    MWBase::Environment::get().getSoundManager()->playSound(item.getClass().getDownSoundId(item), 1, 1);
+    updateView();
+}
+
+void Recharge::onItemCancel()
+{
+    mItemSelectionDialog->setVisible(false);
+}
+
 void Recharge::onItemClicked(MyGUI::Widget *sender, const MWWorld::Ptr& item)
 {
     MWWorld::Ptr gem = *mGemIcon->getUserData<MWWorld::Ptr>();
diff --git a/apps/openmw/mwgui/recharge.hpp b/apps/openmw/mwgui/recharge.hpp
index bbcf994dd..cc3db14df 100644
--- a/apps/openmw/mwgui/recharge.hpp
+++ b/apps/openmw/mwgui/recharge.hpp
@@ -3,6 +3,8 @@
 
 #include "windowbase.hpp"
 
+#include "itemselection.hpp"
+
 namespace MWWorld
 {
     class Ptr;
@@ -11,6 +13,7 @@ namespace MWWorld
 namespace MWGui
 {
 
+class ItemSelectionDialog;
 class ItemWidget;
 class ItemChargeView;
 
@@ -32,12 +35,19 @@ protected:
 
     ItemWidget* mGemIcon;
 
+    ItemSelectionDialog* mItemSelectionDialog;
+
     MyGUI::TextBox* mChargeLabel;
 
     MyGUI::Button* mCancelButton;
 
     void updateView();
 
+    void onSelectItem(MyGUI::Widget* sender);
+
+    void onItemSelected(MWWorld::Ptr item);
+    void onItemCancel();
+
     void onItemClicked (MyGUI::Widget* sender, const MWWorld::Ptr& item);
     void onCancel (MyGUI::Widget* sender);
     void onMouseWheel(MyGUI::Widget* _sender, int _rel);
diff --git a/apps/openmw/mwgui/repair.cpp b/apps/openmw/mwgui/repair.cpp
index 3acea985b..156f4412b 100644
--- a/apps/openmw/mwgui/repair.cpp
+++ b/apps/openmw/mwgui/repair.cpp
@@ -30,6 +30,7 @@ namespace MWGui
 
 Repair::Repair()
     : WindowBase("openmw_repair.layout")
+    , mItemSelectionDialog(NULL)
 {
     getWidget(mRepairBox, "RepairBox");
     getWidget(mToolBox, "ToolBox");
@@ -39,9 +40,11 @@ Repair::Repair()
     getWidget(mCancelButton, "CancelButton");
 
     mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &Repair::onCancel);
-    mRepairBox->eventItemClicked += MyGUI::newDelegate(this, &Repair::onRepairItem);
 
+    mRepairBox->eventItemClicked += MyGUI::newDelegate(this, &Repair::onRepairItem);
     mRepairBox->setDisplayMode(ItemChargeView::DisplayMode_Health);
+
+    mToolIcon->eventMouseButtonClick += MyGUI::newDelegate(this, &Repair::onSelectItem);
 }
 
 void Repair::open()
@@ -83,6 +86,8 @@ void Repair::updateRepairView()
 
     float quality = ref->mBase->mData.mQuality;
 
+    mToolIcon->setUserData(mRepair.getTool());
+
     std::stringstream qualityStr;
     qualityStr << std::setprecision(3) << quality;
 
@@ -93,6 +98,12 @@ void Repair::updateRepairView()
     mToolBox->setVisible(toolBoxVisible);
     mToolBox->setUserString("Hidden", toolBoxVisible ? "false" : "true");
 
+    if (!toolBoxVisible)
+    {
+        mToolIcon->setItem(MWWorld::Ptr());
+        mToolIcon->clearUserStrings();
+    }
+
     mRepairBox->update();
 
     Gui::Box* box = dynamic_cast<Gui::Box*>(mMainWidget);
@@ -103,6 +114,36 @@ void Repair::updateRepairView()
     center();
 }
 
+void Repair::onSelectItem(MyGUI::Widget *sender)
+{
+    delete mItemSelectionDialog;
+    mItemSelectionDialog = new ItemSelectionDialog("#{sRepair}");
+    mItemSelectionDialog->eventItemSelected += MyGUI::newDelegate(this, &Repair::onItemSelected);
+    mItemSelectionDialog->eventDialogCanceled += MyGUI::newDelegate(this, &Repair::onItemCancel);
+    mItemSelectionDialog->setVisible(true);
+    mItemSelectionDialog->openContainer(MWMechanics::getPlayer());
+    mItemSelectionDialog->setFilter(SortFilterItemModel::Filter_OnlyRepairTools);
+}
+
+void Repair::onItemSelected(MWWorld::Ptr item)
+{
+    mItemSelectionDialog->setVisible(false);
+
+    mToolIcon->setItem(item);
+    mToolIcon->setUserString ("ToolTipType", "ItemPtr");
+    mToolIcon->setUserData(item);
+
+    mRepair.setTool(item);
+
+    MWBase::Environment::get().getSoundManager()->playSound(item.getClass().getDownSoundId(item), 1, 1);
+    updateRepairView();
+}
+
+void Repair::onItemCancel()
+{
+    mItemSelectionDialog->setVisible(false);
+}
+
 void Repair::onCancel(MyGUI::Widget* /*sender*/)
 {
     exit();
diff --git a/apps/openmw/mwgui/repair.hpp b/apps/openmw/mwgui/repair.hpp
index 8746f7dc4..c50ba861a 100644
--- a/apps/openmw/mwgui/repair.hpp
+++ b/apps/openmw/mwgui/repair.hpp
@@ -3,11 +3,14 @@
 
 #include "windowbase.hpp"
 
+#include "itemselection.hpp"
+
 #include "../mwmechanics/repair.hpp"
 
 namespace MWGui
 {
 
+class ItemSelectionDialog;
 class ItemWidget;
 class ItemChargeView;
 
@@ -29,6 +32,8 @@ protected:
 
     ItemWidget* mToolIcon;
 
+    ItemSelectionDialog* mItemSelectionDialog;
+
     MyGUI::TextBox* mUsesLabel;
     MyGUI::TextBox* mQualityLabel;
 
@@ -38,6 +43,11 @@ protected:
 
     void updateRepairView();
 
+    void onSelectItem(MyGUI::Widget* sender);
+
+    void onItemSelected(MWWorld::Ptr item);
+    void onItemCancel();
+
     void onRepairItem(MyGUI::Widget* sender, const MWWorld::Ptr& ptr);
     void onCancel(MyGUI::Widget* sender);
 
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.cpp b/apps/openmw/mwgui/sortfilteritemmodel.cpp
index 09438b950..60111fb79 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.cpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.cpp
@@ -129,6 +129,8 @@ namespace MWGui
         if ((mFilter & Filter_OnlyChargedSoulstones) && (base.getTypeName() != typeid(ESM::Miscellaneous).name()
                                                      || base.getCellRef().getSoul() == ""))
             return false;
+        if ((mFilter & Filter_OnlyRepairTools) && (base.getTypeName() != typeid(ESM::Repair).name()))
+            return false;
         if ((mFilter & Filter_OnlyEnchantable) && (item.mFlags & ItemStack::Flag_Enchanted
                                                || (base.getTypeName() != typeid(ESM::Armor).name()
                                                    && base.getTypeName() != typeid(ESM::Clothing).name()
diff --git a/apps/openmw/mwgui/sortfilteritemmodel.hpp b/apps/openmw/mwgui/sortfilteritemmodel.hpp
index 3d5396e2a..4731cbb8a 100644
--- a/apps/openmw/mwgui/sortfilteritemmodel.hpp
+++ b/apps/openmw/mwgui/sortfilteritemmodel.hpp
@@ -41,6 +41,7 @@ namespace MWGui
         static const int Filter_OnlyUsableItems = (1<<4); // Only items with a Use action
         static const int Filter_OnlyRepairable = (1<<5);
         static const int Filter_OnlyRechargable = (1<<6);
+        static const int Filter_OnlyRepairTools = (1<<7);
 
 
     private:
diff --git a/apps/openmw/mwmechanics/aicombataction.cpp b/apps/openmw/mwmechanics/aicombataction.cpp
index 1082c540b..d0464418b 100644
--- a/apps/openmw/mwmechanics/aicombataction.cpp
+++ b/apps/openmw/mwmechanics/aicombataction.cpp
@@ -264,6 +264,13 @@ namespace MWMechanics
         case ESM::MagicEffect::ResistCorprusDisease:
         case ESM::MagicEffect::Invisibility:
         case ESM::MagicEffect::Chameleon:
+        case ESM::MagicEffect::NightEye:
+        case ESM::MagicEffect::Vampirism:
+        case ESM::MagicEffect::StuntedMagicka:
+        case ESM::MagicEffect::ExtraSpell:
+        case ESM::MagicEffect::RemoveCurse:
+        case ESM::MagicEffect::CommandCreature:
+        case ESM::MagicEffect::CommandHumanoid:
             return 0.f;
 
         case ESM::MagicEffect::Sound:
@@ -295,6 +302,8 @@ namespace MWMechanics
         case ESM::MagicEffect::ResistParalysis:
         case ESM::MagicEffect::ResistPoison:
         case ESM::MagicEffect::ResistShock:
+        case ESM::MagicEffect::SpellAbsorption:
+        case ESM::MagicEffect::Reflect:
             return 0.f; // probably useless since we don't know in advance what the enemy will cast
 
         // don't cast these for now as they would make the NPC cast the same effect over and over again, especially when they have potions
@@ -304,13 +313,50 @@ namespace MWMechanics
         case ESM::MagicEffect::FortifyFatigue:
         case ESM::MagicEffect::FortifySkill:
         case ESM::MagicEffect::FortifyMaximumMagicka:
+        case ESM::MagicEffect::FortifyAttack:
             return 0.f;
 
+        case ESM::MagicEffect::Burden:
+            {
+                if (enemy.isEmpty())
+                    return 0.f;
+
+                // Ignore enemy without inventory
+                if (!enemy.getClass().hasInventoryStore(enemy))
+                    return 0.f;
+
+                // burden makes sense only to overburden an enemy
+                float burden = enemy.getClass().getEncumbrance(enemy) - enemy.getClass().getCapacity(enemy);
+                if (burden > 0)
+                    return 0.f;
+
+                if ((effect.mMagnMin + effect.mMagnMax)/2.f > -burden)
+                    rating *= 3;
+                else
+                    return 0.f;
+
+                break;
+            }
+
         case ESM::MagicEffect::Feather:
-            if (actor.getClass().getEncumbrance(actor) - actor.getClass().getCapacity(actor) >= 0)
-                return 100.f;
-            else
-                return 0.f;
+            {
+                // Ignore actors without inventory
+                if (!actor.getClass().hasInventoryStore(actor))
+                    return 0.f;
+
+                // feather makes sense only for overburden actors
+                float burden = actor.getClass().getEncumbrance(actor) - actor.getClass().getCapacity(actor);
+                if (burden <= 0)
+                    return 0.f;
+
+                if ((effect.mMagnMin + effect.mMagnMax)/2.f >= burden)
+                    rating *= 3;
+                else
+                    return 0.f;
+
+                break;
+            }
+
         case ESM::MagicEffect::Levitate:
             return 0.f; // AI isn't designed to take advantage of this, and could be perceived as unfair anyway
         case ESM::MagicEffect::BoundBoots:
diff --git a/files/mygui/openmw_chargen_class.layout b/files/mygui/openmw_chargen_class.layout
index 53a6a6642..35dd57ca3 100644
--- a/files/mygui/openmw_chargen_class.layout
+++ b/files/mygui/openmw_chargen_class.layout
@@ -27,16 +27,23 @@
             </Widget>
 
             <!-- Favorite Attributes -->
-            <Widget type="TextBox" skin="HeaderText" position="0 41 166 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="VBox" skin="" position="0 39 166 72" align="Stretch">
+                <Property key="Spacing" value="0"/>
+
+                <!-- Favorite Attributes -->
+                <Widget type="AutoSizedEditBox" skin="HeaderText" position="0 0 166 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}"/>
+                    <Property key="MultiLine" value="true"/>
+                    <Property key="WordWrap" value="true"/>
+                </Widget>
 
-            <Widget type="MWAttribute" skin="MW_StatName" position="0 59 166 18" name="FavoriteAttribute0" align="Left Top"/>
-            <Widget type="MWAttribute" skin="MW_StatName" position="0 77 166 18" name="FavoriteAttribute1" align="Left Top"/>
+                <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 0 166 18" name="FavoriteAttribute0" align="Left Top"/>
+                <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 0 166 18" name="FavoriteAttribute1" align="Left Top"/>
+             </Widget>
 
             <!-- Major Skills -->
             <Widget type="TextBox" skin="HeaderText" position="166 0 162 18" name="MajorSkillT" align="Left Top">
diff --git a/files/mygui/openmw_chargen_create_class.layout b/files/mygui/openmw_chargen_create_class.layout
index 5f0b02c1b..9ca6c6a31 100644
--- a/files/mygui/openmw_chargen_create_class.layout
+++ b/files/mygui/openmw_chargen_create_class.layout
@@ -26,22 +26,30 @@
                 <Property key="TextAlign" value="Left Top"/>
             </Widget>
 
-            <!-- Favorite Attributes -->
-            <Widget type="TextBox" skin="HeaderText" position="0 41 166 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="VBox" skin="" position="0 41 166 72" align="Stretch">
+                <Property key="Spacing" value="0"/>
+
+                <!-- Favorite Attributes -->
+                <Widget type="AutoSizedEditBox" skin="HeaderText" position="0 0 166 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}"/>
+                    <Property key="MultiLine" value="true"/>
+                    <Property key="WordWrap" value="true"/>
+                </Widget>
 
-            <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 59 166 18" name="FavoriteAttribute0" align="Left Top"/>
-            <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 77 166 18" name="FavoriteAttribute1" align="Left Top"/>
+                <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 0 166 18" name="FavoriteAttribute0" align="Left Top"/>
+                <Widget type="MWAttribute" skin="MW_StatNameButton" position="0 0 166 18" name="FavoriteAttribute1" align="Left Top"/>
+             </Widget>
 
             <!-- Major Skills -->
             <Widget type="TextBox" skin="HeaderText" position="166 0 166 18" name="MajorSkillT" align="Left Top">
                 <Property key="Caption" value="#{sChooseClassMenu3}"/>
                 <Property key="TextAlign" value="Left Top"/>
+                <Property key="MultiLine" value="true"/>
+                <Property key="WordWrap" value="true"/>
             </Widget>
 
             <Widget type="MWSkill" skin="MW_StatNameButton" position="166 18 166 18" name="MajorSkill0" align="Left Top"/>
diff --git a/files/mygui/openmw_chargen_race.layout b/files/mygui/openmw_chargen_race.layout
index bddede361..04bd9cc53 100644
--- a/files/mygui/openmw_chargen_race.layout
+++ b/files/mygui/openmw_chargen_race.layout
@@ -57,7 +57,7 @@
         <Widget type="TextBox" skin="HeaderText" position="261 16 132 18" name="RaceT" align="Left Top">
             <Property key="TextAlign" value="Left Top"/>
         </Widget>
-        <Widget type="ListBox" skin="MW_List" position="264 39 132 161" name="RaceList">
+        <Widget type="ListBox" skin="MW_List" position="264 39 132 150" name="RaceList">
         </Widget>
 
         <!-- Spell powers -->
diff --git a/files/mygui/openmw_chargen_select_attribute.layout b/files/mygui/openmw_chargen_select_attribute.layout
index a00577e41..0821d4a57 100644
--- a/files/mygui/openmw_chargen_select_attribute.layout
+++ b/files/mygui/openmw_chargen_select_attribute.layout
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 217 234" align="Center" name="_Main">
-        <Widget type="Widget" skin="" position="14 14 186 203" align="Stretch">
+    <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 217 234" align="Center" name="_Main">
+        <Widget type="Widget" skin="" position="14 14 200 203" align="HCenter VStretch">
 
             <!-- Label -->
-            <Widget type="TextBox" skin="HeaderText" position="0 0 186 18" name="LabelT" align="Left Top">
+            <Widget type="TextBox" skin="HeaderText" position="0 0 200 18" name="LabelT" align="HCenter Top">
                 <Property key="Caption" value="#{sAttributesMenu1}"/>
                 <Property key="TextAlign" value="HCenter Top"/>
             </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 200 18" name="Attribute0" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 46 200 18" name="Attribute1" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 64 200 18" name="Attribute2" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 82 200 18" name="Attribute3" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 100 200 18" name="Attribute4" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 118 200 18" name="Attribute5" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 136 200 18" name="Attribute6" align="Left Top"/>
+            <Widget type="MWAttribute" skin="MW_StatNameButtonC" position="0 154 200 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 b6e90b688..d1061882d 100644
--- a/files/mygui/openmw_chargen_select_skill.layout
+++ b/files/mygui/openmw_chargen_select_skill.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 477 270" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 477 270" align="Center" name="_Main">
         <Widget type="Widget" skin="" position="17 14 447 239" align="Stretch">
 
             <!-- Label -->
diff --git a/files/mygui/openmw_chargen_select_specialization.layout b/files/mygui/openmw_chargen_select_specialization.layout
index 70c5fdca5..c4fe6c631 100644
--- a/files/mygui/openmw_chargen_select_specialization.layout
+++ b/files/mygui/openmw_chargen_select_specialization.layout
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
     <!-- correct size is 247 144, adjust when skin is changed to a dialog -->
-    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 247 144" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" layer="Windows" position="0 0 247 144" align="Center" name="_Main">
         <Widget type="Widget" skin="" position="14 14 216 113" align="Stretch">
 
             <!-- Label -->
-            <Widget type="TextBox" skin="HeaderText" position="0 0 216 18" name="LabelT" align="Left Top">
+            <Widget type="TextBox" skin="HeaderText" position="0 0 216 18" name="LabelT" align="Center Top">
                 <Property key="Caption" value="#{sSpecializationMenu1}"/>
-                <Property key="TextAlign" value="Left Top"/>
+                <Property key="TextAlign" value="Center Top"/>
             </Widget>
 
             <!-- Specialization list -->
diff --git a/files/mygui/openmw_infobox.layout b/files/mygui/openmw_infobox.layout
index ea9f78614..252a237cd 100644
--- a/files/mygui/openmw_infobox.layout
+++ b/files/mygui/openmw_infobox.layout
@@ -11,6 +11,6 @@
         </Widget>
 
         <!-- Button bar, buttons are created as children -->
-        <Widget type="Widget" skin="" position="72 98 400 150" name="ButtonBar" align="Top HCenter" />
+        <Widget type="Widget" skin="" position="72 98 450 150" name="ButtonBar" align="Top HCenter" />
     </Widget>
 </MyGUI>
diff --git a/files/mygui/openmw_itemselection_dialog.layout b/files/mygui/openmw_itemselection_dialog.layout
index 5ae30563a..b2337b669 100644
--- a/files/mygui/openmw_itemselection_dialog.layout
+++ b/files/mygui/openmw_itemselection_dialog.layout
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <MyGUI type="Layout">
-    <Widget type="Window" skin="MW_Dialog" position="0 0 380 285" layer="Windows" align="Center" name="_Main">
+    <Widget type="Window" skin="MW_DialogNoTransp" position="0 0 380 285" layer="Windows" align="Center" name="_Main">
 
         <Widget type="TextBox" skin="SandText" position="8 8 300 18" name="Label"/>
 
diff --git a/files/mygui/openmw_levelup_dialog.layout b/files/mygui/openmw_levelup_dialog.layout
index ad0004934..fc11ddfd7 100644
--- a/files/mygui/openmw_levelup_dialog.layout
+++ b/files/mygui/openmw_levelup_dialog.layout
@@ -2,7 +2,7 @@
 
 <MyGUI type="Layout">
     <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 0 0" align="Center" name="_Main">
-        <Property key="Padding" value="12"/>
+        <Property key="Padding" value="10"/>
         <Property key="Spacing" value="8"/>
         <Property key="AutoResize" value="true"/>
 
@@ -22,25 +22,25 @@
             <Property key="Static" value="true"/>
         </Widget>
 
-        <Widget type="Widget" skin="" position="0 0 100 16" name="Coins">
+        <Widget type="Widget" skin="" position="0 0 150 16" name="Coins">
             <UserString key="HStretch" value="true"/>
             <UserString key="VStretch" value="false"/>
         </Widget>
 
-        <Widget type="Widget" skin="" position="0 280 391 100" name="AssignWidget">
+        <Widget type="Widget" skin="" position="0 280 420 84" name="AssignWidget">
             <UserString key="HStretch" value="false"/>
             <UserString key="VStretch" value="false"/>
 
-            <Widget type="TextBox" skin="SandTextVCenter" position="22 0 100 24" name="AttribMultiplier1"/>
-            <Widget type="TextBox" skin="SandTextVCenter" position="22 24 100 24" name="AttribMultiplier2"/>
-            <Widget type="TextBox" skin="SandTextVCenter" position="22 48 100 24" name="AttribMultiplier3"/>
-            <Widget type="TextBox" skin="SandTextVCenter" position="22 72 100 24" name="AttribMultiplier4"/>
-            <Widget type="TextBox" skin="SandTextVCenter" position="218 0 100 24" name="AttribMultiplier5"/>
-            <Widget type="TextBox" skin="SandTextVCenter" position="218 24 100 24" name="AttribMultiplier6"/>
-            <Widget type="TextBox" skin="SandTextVCenter" position="218 48 100 24" name="AttribMultiplier7"/>
-            <Widget type="TextBox" skin="SandTextVCenter" position="218 72 100 24" name="AttribMultiplier8"/>
+            <Widget type="TextBox" skin="SandTextVCenter" position="32 0 100 20" name="AttribMultiplier1"/>
+            <Widget type="TextBox" skin="SandTextVCenter" position="32 20 100 20" name="AttribMultiplier2"/>
+            <Widget type="TextBox" skin="SandTextVCenter" position="32 40 100 20" name="AttribMultiplier3"/>
+            <Widget type="TextBox" skin="SandTextVCenter" position="32 60 100 20" name="AttribMultiplier4"/>
+            <Widget type="TextBox" skin="SandTextVCenter" position="218 0 100 20" name="AttribMultiplier5"/>
+            <Widget type="TextBox" skin="SandTextVCenter" position="218 20 100 20" name="AttribMultiplier6"/>
+            <Widget type="TextBox" skin="SandTextVCenter" position="218 40 100 20" name="AttribMultiplier7"/>
+            <Widget type="TextBox" skin="SandTextVCenter" position="218 60 100 20" name="AttribMultiplier8"/>
 
-            <Widget type="HBox" position="42 0 200 24">
+            <Widget type="HBox" position="52 0 200 20">
                 <Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib1">
                     <UserString key="TextPadding" value="0 0"/>
                     <UserString key="ToolTipType" value="Layout"/>
@@ -54,7 +54,7 @@
                 </Widget>
             </Widget>
 
-            <Widget type="HBox" position="42 24 200 24">
+            <Widget type="HBox" position="52 20 200 20">
                 <Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib2">
                     <UserString key="TextPadding" value="0 0"/>
                     <UserString key="ToolTipType" value="Layout"/>
@@ -68,7 +68,7 @@
                 </Widget>
             </Widget>
 
-            <Widget type="HBox" position="42 48 200 24">
+            <Widget type="HBox" position="52 40 200 20">
                 <Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib3">
                     <UserString key="TextPadding" value="0 0"/>
                     <UserString key="ToolTipType" value="Layout"/>
@@ -82,7 +82,7 @@
                 </Widget>
             </Widget>
 
-            <Widget type="HBox" position="42 72 200 24">
+            <Widget type="HBox" position="52 60 200 20">
                 <Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib4">
                     <UserString key="TextPadding" value="0 0"/>
                     <UserString key="ToolTipType" value="Layout"/>
@@ -97,7 +97,7 @@
             </Widget>
 
 
-            <Widget type="HBox" position="238 0 200 24">
+            <Widget type="HBox" position="238 0 200 20">
                 <Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib5">
                     <UserString key="TextPadding" value="0 0"/>
                     <UserString key="ToolTipType" value="Layout"/>
@@ -111,7 +111,7 @@
                 </Widget>
             </Widget>
 
-            <Widget type="HBox" position="238 24 200 24">
+            <Widget type="HBox" position="238 20 200 20">
                 <Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib6">
                     <UserString key="TextPadding" value="0 0"/>
                     <UserString key="ToolTipType" value="Layout"/>
@@ -125,7 +125,7 @@
                 </Widget>
             </Widget>
 
-            <Widget type="HBox" position="238 48 200 24">
+            <Widget type="HBox" position="238 40 200 20">
                 <Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib7">
                 <UserString key="TextPadding" value="0 0"/>
                 <UserString key="ToolTipType" value="Layout"/>
@@ -139,7 +139,7 @@
                 </Widget>
             </Widget>
 
-            <Widget type="HBox" position="238 72 200 24">
+            <Widget type="HBox" position="238 60 200 20">
                 <Widget type="AutoSizedButton" skin="SandTextButton" name="Attrib8">
                 <UserString key="TextPadding" value="0 0"/>
                 <UserString key="ToolTipType" value="Layout"/>
diff --git a/files/mygui/openmw_list.skin.xml b/files/mygui/openmw_list.skin.xml
index 111d3bf30..8a238879c 100644
--- a/files/mygui/openmw_list.skin.xml
+++ b/files/mygui/openmw_list.skin.xml
@@ -127,7 +127,7 @@
     <Resource type="ResourceSkin" name="MW_List" size="516 516" align="Left Top">
         <Property key="NeedKey" value="true"/>
         <Property key="SkinLine" value="MW_ListLine"/>
-        <Property key="HeightLine" value="20"/>
+        <Property key="HeightLine" value="18"/>
 
         <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="Stretch"/>
 
@@ -140,7 +140,7 @@
     <Resource type="ResourceSkin" name="MW_PopupList" size="516 516" align="Left Top">
         <Property key="NeedKey" value="true"/>
         <Property key="SkinLine" value="MW_ListLine"/>
-        <Property key="HeightLine" value="20"/>
+        <Property key="HeightLine" value="18"/>
 
         <Child type="Widget" skin="BlackBG" offset="0 0 516 516" align="Stretch"/>
         <Child type="Widget" skin="MW_Box" offset="0 0 516 516" align="Stretch"/>
diff --git a/files/mygui/openmw_recharge_dialog.layout b/files/mygui/openmw_recharge_dialog.layout
index 9301bec92..d620aadab 100644
--- a/files/mygui/openmw_recharge_dialog.layout
+++ b/files/mygui/openmw_recharge_dialog.layout
@@ -1,22 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 329 253" align="Center" name="_Main">
+    <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 330 385" align="Center" name="_Main">
         <Property key="Padding" value="12"/>
         <Property key="Spacing" value="8"/>
 
-        <Widget type="HBox" name="GemBox">
-            <UserString key="HStretch" value="true"/>
-
-            <Widget type="ItemWidget" skin="MW_ItemIconSmall" position="0 0 32 32" name="GemIcon"/>
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
-            <Widget type="AutoSizedTextBox" skin="SandText" name="ChargeLabel">
-                <Property key="Caption" value="#{sQuality}"/>
-                <Property key="TextAlign" value="Right"/>
-            </Widget>
-
+        <Widget type="AutoSizedTextBox" skin="SandText" name="Label">
+            <Property key="Caption" value="#{sRechargeEnchantment}"/>
         </Widget>
 
         <Widget type="ItemChargeView" skin="MW_ItemChargeView" align="Left Stretch" name="Box">
@@ -26,14 +16,25 @@
 
         <Widget type="HBox">
             <UserString key="HStretch" value="true"/>
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
-            <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton">
-                <Property key="Caption" value="#{sCancel}"/>
-            </Widget>
+                <Widget type="ItemWidget" skin="MW_ItemIconBox" position="0 0 44 44" name="GemIcon">
+                </Widget>
+
+                <Widget type="HBox" name="GemBox">
+                    <Widget type="AutoSizedTextBox" skin="SandText" name="ChargeLabel">
+                        <UserString key="HStretch" value="true"/>
+                        <Property key="Caption" value="#{sCharges}"/>
+                        <Property key="TextAlign" value="Left"/>
+                    </Widget>
+                </Widget>
+
+               <Widget type="Widget">
+                   <UserString key="HStretch" value="true"/>
+               </Widget>
+
+               <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton">
+                   <Property key="Caption" value="#{sCancel}"/>
+               </Widget>
         </Widget>
-
     </Widget>
 
 </MyGUI>
diff --git a/files/mygui/openmw_repair.layout b/files/mygui/openmw_repair.layout
index 9a349c56b..340711bb1 100644
--- a/files/mygui/openmw_repair.layout
+++ b/files/mygui/openmw_repair.layout
@@ -1,26 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <MyGUI type="Layout">
-    <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 329 253" align="Center" name="_Main">
+    <Widget type="VBox" skin="MW_Dialog" layer="Windows" position="0 0 330 385" align="Center" name="_Main">
         <Property key="Padding" value="12"/>
         <Property key="Spacing" value="8"/>
 
-        <Widget type="HBox" name="ToolBox">
-            <UserString key="HStretch" value="true"/>
-
-            <Widget type="ItemWidget" skin="MW_ItemIconSmall" position="0 0 32 32" name="ToolIcon"/>
-
-            <Widget type="AutoSizedTextBox" skin="SandText" name="UsesLabel">
-                <Property key="Caption" value="#{sUses}"/>
-            </Widget>
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
-            <Widget type="AutoSizedTextBox" skin="SandText" name="QualityLabel">
-                <Property key="Caption" value="#{sQuality}"/>
-                <Property key="TextAlign" value="Right"/>
-            </Widget>
-        </Widget>
+        <Widget type="AutoSizedTextBox" skin="SandText" name="Label">
+            <Property key="Caption" value="#{sRepairServiceTitle}"/>
+        </Widget>      
 
         <Widget type="ItemChargeView" skin="MW_ItemChargeView" align="Left Stretch" name="RepairBox">
             <UserString key="VStretch" value="true"/>
@@ -29,14 +16,31 @@
 
         <Widget type="HBox">
             <UserString key="HStretch" value="true"/>
-            <Widget type="Widget">
-                <UserString key="HStretch" value="true"/>
-            </Widget>
-            <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton">
-                <Property key="Caption" value="#{sCancel}"/>
-            </Widget>
+                <Widget type="ItemWidget" skin="MW_ItemIconBox" position="0 0 44 44" name="ToolIcon">
+                </Widget>
+
+                <Widget type="HBox" name="ToolBox">
+                    <Widget type="VBox">
+                        <Widget type="AutoSizedTextBox" skin="SandText" name="UsesLabel">
+                            <UserString key="HStretch" value="true"/>
+                            <Property key="Caption" value="#{sUses}"/>
+                            <Property key="TextAlign" value="Left"/>
+                        </Widget>
+                        <Widget type="AutoSizedTextBox" skin="SandText" name="QualityLabel">
+                            <UserString key="HStretch" value="true"/>
+                            <Property key="Caption" value="#{sQuality}"/>
+                            <Property key="TextAlign" value="Left"/>
+                        </Widget>
+                    </Widget>
+                </Widget>
+                
+               <Widget type="Widget">
+                   <UserString key="HStretch" value="true"/>
+               </Widget>
+
+               <Widget type="AutoSizedButton" skin="MW_Button" name="CancelButton">
+                   <Property key="Caption" value="#{sCancel}"/>
+               </Widget>
         </Widget>
-
     </Widget>
-
 </MyGUI>