diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index cbcddd972..9345df0d2 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -347,15 +347,15 @@ namespace CSMWorld
         int mIndex;
         bool mMajor;
 
-        SkillsColumn (int index, bool major)
-        : Column<ESXRecordT> ((major ? "Major Skill #" : "Minor Skill #")+
+        SkillsColumn (int index, bool typePrefix = false, bool major = false)
+        : Column<ESXRecordT> ((typePrefix ? (major ? "Major Skill #" : "Minor Skill #") : "Skill #")+
             boost::lexical_cast<std::string> (index), ColumnBase::Display_String),
             mIndex (index), mMajor (major)
         {}
 
         virtual QVariant get (const Record<ESXRecordT>& record) const
         {
-            int skill = record.get().mData.mSkills[mIndex][mMajor ? 1 : 0];
+            int skill = record.get().mData.getSkill (mIndex, mMajor);
 
             return QString::fromUtf8 (ESM::Skill::indexToId (skill).c_str());
         }
@@ -373,7 +373,7 @@ namespace CSMWorld
             {
                 ESXRecordT record2 = record.get();
 
-                record2.mData.mSkills[mIndex][mMajor ? 1 : 0] = index;
+                record2.mData.getSkill (mIndex, mMajor) = index;
 
                 record.setModified (record2);
             }
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 825e29a23..23a1eb91b 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -51,15 +51,17 @@ CSMWorld::Data::Data()
     mClasses.addColumn (new AttributesColumn<ESM::Class> (1));
     mClasses.addColumn (new SpecialisationColumn<ESM::Class>);
     for (int i=0; i<5; ++i)
-        mClasses.addColumn (new SkillsColumn<ESM::Class> (i, true));
+        mClasses.addColumn (new SkillsColumn<ESM::Class> (i, true, true));
     for (int i=0; i<5; ++i)
-        mClasses.addColumn (new SkillsColumn<ESM::Class> (i, false));
+        mClasses.addColumn (new SkillsColumn<ESM::Class> (i, true, false));
     mClasses.addColumn (new PlayableColumn<ESM::Class>);
     mClasses.addColumn (new DescriptionColumn<ESM::Class>);
 
     mFactions.addColumn (new StringIdColumn<ESM::Faction>);
     mFactions.addColumn (new RecordStateColumn<ESM::Faction>);
     mFactions.addColumn (new NameColumn<ESM::Faction>);
+    for (int i=0; i<6; ++i)
+        mFactions.addColumn (new SkillsColumn<ESM::Faction> (i));
 
     addModel (new IdTable (&mGlobals), UniversalId::Type_Globals, UniversalId::Type_Global);
     addModel (new IdTable (&mGmsts), UniversalId::Type_Gmsts, UniversalId::Type_Gmst);