diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index f674e9dc79..42e10c76b1 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -15,6 +15,7 @@
 #include <components/fileorderlist/utils/naturalsort.hpp>
 #include <components/fileorderlist/utils/profilescombobox.hpp>
 
+#include <components/fileorderlist/masterproxymodel.hpp>"a.out.h"
 #include "settings/gamesettings.hpp"
 #include "settings/launchersettings.hpp"
 
@@ -29,19 +30,11 @@ DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, GameSettings &gam
     setupUi(this);
 
     // Models
-    mDataFilesModel = new DataFilesModel(this);
+    mDataFilesModel = new DataFilesModel (this);
 
-    mMastersProxyModel = new QSortFilterProxyModel();
-    mMastersProxyModel->setFilterRegExp(QString("game")); //QString("^.*\\.esm"));
-    mMastersProxyModel->setFilterRole (Qt::UserRole);
-    mMastersProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
-    mMastersProxyModel->setSourceModel(mDataFilesModel);
+    mMastersProxyModel = new MasterProxyModel (this, mDataFilesModel);
 
-    mPluginsProxyModel = new PluginsProxyModel();
-    mPluginsProxyModel->setFilterRegExp(QString("addon")); //^.*\\.esp"));
-    mPluginsProxyModel->setFilterRole (Qt::UserRole);
-    mPluginsProxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
-    mPluginsProxyModel->setSourceModel(mDataFilesModel);
+    mPluginsProxyModel = new PluginsProxyModel (this, mDataFilesModel);
 
     mFilterProxyModel = new QSortFilterProxyModel();
     mFilterProxyModel->setDynamicSortFilter(true);
diff --git a/apps/opencs/view/doc/filedialog.cpp b/apps/opencs/view/doc/filedialog.cpp
index d49906949c..dd94b05717 100644
--- a/apps/opencs/view/doc/filedialog.cpp
+++ b/apps/opencs/view/doc/filedialog.cpp
@@ -24,25 +24,19 @@ FileDialog::FileDialog(QWidget *parent) :
     setupUi(this);
 
     // Models
-    mDataFilesModel = new DataFilesModel(this);
+    mDataFilesModel = new DataFilesModel (this);
 
-    mMastersProxyModel = new MasterProxyModel();
-    mMastersProxyModel->setFilterRegExp("game"); //QString("^.*\\.esm"));
-    mMastersProxyModel->setFilterRole (Qt::UserRole);
-    mMastersProxyModel->setSourceModel(mDataFilesModel);
+    mMastersProxyModel = new MasterProxyModel (this, mDataFilesModel);
+    mPluginsProxyModel = new PluginsProxyModel (this, mDataFilesModel);
 
-    mPluginsProxyModel = new PluginsProxyModel();
-    mPluginsProxyModel->setFilterRegExp("addon"); //QString("^.*\\.esp"));
-    mPluginsProxyModel->setFilterRole (Qt::UserRole);
-    mPluginsProxyModel->setSourceModel(mDataFilesModel);
 
     mFilterProxyModel = new QSortFilterProxyModel();
     mFilterProxyModel->setDynamicSortFilter(true);
     mFilterProxyModel->setSourceModel(mPluginsProxyModel);
-
+/*
     QCheckBox checkBox;
     unsigned int height = checkBox.sizeHint().height() + 4;
-
+*/
     masterView->setModel(mMastersProxyModel);
 /*
     mastersTable->setModel(mMastersProxyModel);
@@ -70,10 +64,10 @@ FileDialog::FileDialog(QWidget *parent) :
     pluginsTable->setAlternatingRowColors(true);
     pluginsTable->setVerticalScrollMode(QAbstractItemView::ScrollPerItem);
     pluginsTable->horizontalHeader()->setStretchLastSection(true);
-
+/*
     pluginsTable->verticalHeader()->setDefaultSectionSize(height);
     pluginsTable->verticalHeader()->setResizeMode(QHeaderView::Fixed);
-
+*/
     // Hide the profile elements
     profileLabel->hide();
     profilesComboBox->hide();
diff --git a/components/fileorderlist/masterproxymodel.cpp b/components/fileorderlist/masterproxymodel.cpp
index ce874318d9..dc702e9457 100644
--- a/components/fileorderlist/masterproxymodel.cpp
+++ b/components/fileorderlist/masterproxymodel.cpp
@@ -1,8 +1,13 @@
 #include "masterproxymodel.hpp"
 
-MasterProxyModel::MasterProxyModel(QObject *parent) :
+MasterProxyModel::MasterProxyModel(QObject *parent, QAbstractTableModel* model) :
     QSortFilterProxyModel(parent)
 {
+    setFilterRegExp(QString("game"));
+    setFilterRole (Qt::UserRole);
+
+    if (model)
+        setSourceModel (model);
 }
 
 QVariant MasterProxyModel::data(const QModelIndex &index, int role) const
diff --git a/components/fileorderlist/masterproxymodel.hpp b/components/fileorderlist/masterproxymodel.hpp
index d0d2888730..d9e12dada9 100644
--- a/components/fileorderlist/masterproxymodel.hpp
+++ b/components/fileorderlist/masterproxymodel.hpp
@@ -3,11 +3,13 @@
 
 #include <QSortFilterProxyModel>
 
+class QAbstractTableModel;
+
 class MasterProxyModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 public:
-    explicit MasterProxyModel(QObject *parent = 0);
+    explicit MasterProxyModel(QObject *parent = 0, QAbstractTableModel *model = 0);
     virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
 
 signals:
diff --git a/components/fileorderlist/model/pluginsproxymodel.cpp b/components/fileorderlist/model/pluginsproxymodel.cpp
index 4648d28330..61ffb88946 100644
--- a/components/fileorderlist/model/pluginsproxymodel.cpp
+++ b/components/fileorderlist/model/pluginsproxymodel.cpp
@@ -1,8 +1,13 @@
 #include "pluginsproxymodel.hpp"
 
-PluginsProxyModel::PluginsProxyModel(QObject *parent) :
+PluginsProxyModel::PluginsProxyModel(QObject *parent, QAbstractTableModel *model) :
     QSortFilterProxyModel(parent)
 {
+    setFilterRegExp(QString("addon"));
+    setFilterRole (Qt::UserRole);
+
+    if (model)
+        setSourceModel (model);
 }
 
 PluginsProxyModel::~PluginsProxyModel()
diff --git a/components/fileorderlist/model/pluginsproxymodel.hpp b/components/fileorderlist/model/pluginsproxymodel.hpp
index 08baa2338c..238d2aac77 100644
--- a/components/fileorderlist/model/pluginsproxymodel.hpp
+++ b/components/fileorderlist/model/pluginsproxymodel.hpp
@@ -4,12 +4,13 @@
 #include <QSortFilterProxyModel>
 
 class QVariant;
+class QAbstractTableModel;
 
 class PluginsProxyModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 public:
-    explicit PluginsProxyModel(QObject *parent = 0);
+    explicit PluginsProxyModel(QObject *parent = 0, QAbstractTableModel *model = 0);
     ~PluginsProxyModel();
 
     virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;