diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index bb0af03b8..92e8e212b 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -1,20 +1,21 @@
 set(LAUNCHER
-  datafilesdialog.cpp
+  datafilespage.cpp
   lineedit.cpp
   main.cpp
   maindialog.cpp
-  settingsdialog.cpp
-  datafilesdialog.h
-  lineedit.h
-  maindialog.h
-  settingsdialog.h
+  playpage.cpp
+
+  datafilespage.hpp
+  lineedit.hpp
+  maindialog.hpp
+  playpage.hpp
 )
 
 SET(MOC_HDRS
-  datafilesdialog.h
-  lineedit.h
-  maindialog.h
-  settingsdialog.h
+  datafilespage.hpp
+  lineedit.hpp
+  maindialog.hpp
+  playpage.hpp
 )
 
 source_group(apps\\launcher FILES ${ESMTOOL})
diff --git a/apps/launcher/datafilesdialog.cpp b/apps/launcher/datafilesdialog.cpp
index 9b9733ded..a0835f1e9 100644
--- a/apps/launcher/datafilesdialog.cpp
+++ b/apps/launcher/datafilesdialog.cpp
@@ -2,9 +2,6 @@
 #include <components/esm/esm_reader.hpp>
 
 #include "datafilesdialog.h"
-//#include "pluginitemmodel.h"
-//#include "datafilesmodel.h"
-//#include "datafilesitem.h"
 
 using namespace ESM;
 
@@ -172,11 +169,33 @@ DataFilesDialog::DataFilesDialog()
     connect(masterselectmodel, SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)), this, SLOT(masterSelectionChanged(const QItemSelection&, const QItemSelection&)));
     connect(plugintable, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(showContextMenu(const QPoint&)));
     connect(plugintable, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(setCheckstate(QModelIndex)));
+    connect(pluginsmodel, SIGNAL(rowsAboutToBeMoved(const QModelIndex&, int, int, const QModelIndex&, int)), this, SLOT(test()));
     
     // Adjust the dialog width
     setMinimumWidth(500);
 }
 
+void DataFilesDialog::test()
+{
+    qDebug() << "Breaky Breaky!";
+    /*QModelIndexList deselectedindexes = deselected.indexes();
+  
+    if (!deselectedindexes.isEmpty()) {
+        foreach (const QModelIndex &currentindex, deselectedindexes) {
+            qDebug() << "Data is: " << currentindex.data();
+            qDebug() << "Row is: "<< currentindex.row();
+            QList<QStandardItem *> itemlist = pluginsmodel->findItems(QVariant(currentindex.data()).toString());
+            
+            if (!itemlist.isEmpty())
+            {
+                foreach (const QStandardItem *currentitem, itemlist) {
+                    pluginselectmodel->select(currentitem->index(), QItemSelectionModel::Toggle);
+                }
+            }
+        }
+    }*/
+}
+
 void DataFilesDialog::appendPlugins(const QModelIndex &masterindex)
 {
     // Find the plugins in the datafilesmodel and append them to the pluginsmodel
diff --git a/apps/launcher/datafilesdialog.h b/apps/launcher/datafilesdialog.h
index 9a718f3f5..08bad4608 100644
--- a/apps/launcher/datafilesdialog.h
+++ b/apps/launcher/datafilesdialog.h
@@ -16,7 +16,6 @@ class QSortFilterProxyModel;
 #include <QDialog>
 #include <QModelIndex>
 
-class PluginItemModel;
 class QTreeView;
 class QTableView;
 class QStandardItemModel;
@@ -68,6 +67,7 @@ public slots:
     void showContextMenu(const QPoint &point);
     
     void actionCheckstate();
+    void test();
     //void setupView();
 
     void masterSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
diff --git a/apps/launcher/launcher.pro b/apps/launcher/launcher.pro
index 4674c8c39..2df51bb65 100644
--- a/apps/launcher/launcher.pro
+++ b/apps/launcher/launcher.pro
@@ -8,18 +8,15 @@ DEPENDPATH += .
 INCLUDEPATH += .
 
 # Input
-HEADERS += datafilesdialog.h \
-           datafilesitem.h \
-           datafilesmodel.h \
-           lineedit.h \
-           maindialog.h \
-           settingsdialog.h
-SOURCES += datafilesdialog.cpp \
-           datafilesitem.cpp \
-           datafilesmodel.cpp \
+HEADERS += datafilespage.hpp \
+           lineedit.hpp \
+           maindialog.hpp \
+           playpage.hpp
+
+SOURCES += datafilespage.cpp \
            lineedit.cpp \
-           main.cpp \
            maindialog.cpp \
-           qrc_resources.cxx \
-           settingsdialog.cpp
+           playpage.cpp
+           qrc_resources.cxx
+
 RESOURCES += resources.qrc
diff --git a/apps/launcher/lineedit.cpp b/apps/launcher/lineedit.cpp
index 7cd7f4d1d..d39002ff7 100644
--- a/apps/launcher/lineedit.cpp
+++ b/apps/launcher/lineedit.cpp
@@ -7,7 +7,7 @@
 **
 ****************************************************************************/
 
-#include "lineedit.h"
+#include "lineedit.hpp"
 #include <QToolButton>
 #include <QStyle>
 
diff --git a/apps/launcher/lineedit.h b/apps/launcher/lineedit.h
deleted file mode 100644
index 7a96a523c..000000000
--- a/apps/launcher/lineedit.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/****************************************************************************
-**
-** Copyright (c) 2007 Trolltech ASA <info@trolltech.com>
-**
-** Use, modification and distribution is allowed without limitation,
-** warranty, liability or support of any kind.
-**
-****************************************************************************/
-
-#ifndef LINEEDIT_H
-#define LINEEDIT_H
-
-#include <QLineEdit>
-
-class QToolButton;
-
-class LineEdit : public QLineEdit
-{
-    Q_OBJECT
-
-public:
-    LineEdit(QWidget *parent = 0);
-
-protected:
-    void resizeEvent(QResizeEvent *);
-
-private slots:
-    void updateCloseButton(const QString &text);
-
-private:
-    QToolButton *clearButton;
-};
-
-#endif // LIENEDIT_H
-
diff --git a/apps/launcher/main.cpp b/apps/launcher/main.cpp
index 77c01148a..870d16f4c 100644
--- a/apps/launcher/main.cpp
+++ b/apps/launcher/main.cpp
@@ -1,6 +1,6 @@
 #include <QApplication>
 
-#include "maindialog.h"
+#include "maindialog.hpp"
 
 int main(int argc, char *argv[])
 {
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 8ff37dda4..68b2c2e75 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -1,121 +1,141 @@
 #include <QtGui>
+#include <QDebug>
 
-#include "maindialog.h"
-#include "datafilesdialog.h"
-#include "settingsdialog.h"
+#include "maindialog.hpp"
+#include "playpage.hpp"
+#include "datafilespage.hpp"
 
 MainDialog::MainDialog()
-{
-      
-    QLabel *header = new QLabel(this);  
-    header->setMinimumSize(QSize(400, 150));
-    header->setPixmap(QPixmap(":resources/openmw_header.png"));
-
-    // Buttons
-    QPushButton *buttonStart = new QPushButton(this);
-    buttonStart->setMinimumSize(QSize(200, 40));
-    buttonStart->setText(tr("Start OpenMW"));
+{  
+    mIconWidget = new QListWidget;
+    mIconWidget->setViewMode(QListView::IconMode);
+    mIconWidget->setWrapping(false);
     
-    QPushButton *buttonDataFiles = new QPushButton(this);
-    buttonDataFiles->setMinimumSize(QSize(200, 40));
-    buttonDataFiles->setText(tr("Data Files"));
+    mIconWidget->setStyleSheet("QListWidget { background-image: url(background.png); background-color: white; background-repeat: no-repeat; background-attachment: scroll; background-position: right; } QListWidgetItem { alignment: center; }");
+    mIconWidget->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); // Just to be sure
+    
+    //mIconWidget->setItemDelegate(new ListViewDelegate());
+    mIconWidget->setAttribute(Qt::WA_MacShowFocusRect); // Show a focus frame around the icons on Mac
+    //mIconWidget->setLayoutMode(QListView::SinglePass);
+    mIconWidget->setUniformItemSizes(true);
+    
+    mIconWidget->setIconSize(QSize(48, 48));
+    mIconWidget->setMovement(QListView::Static);
+    
+    mIconWidget->setMinimumWidth(400);
+    mIconWidget->setFixedHeight(80);
+    mIconWidget->setSpacing(4);
+    mIconWidget->setCurrentRow(0);
+    //QSize itemSize(80, 80);
+    
+    //mIconWidget->setGridSize ( itemSize );
+    
+    mIconWidget->setFlow(QListView::LeftToRight);
 
-    QPushButton *buttonSettings = new QPushButton(this);
-    buttonSettings->setText(tr("Settings"));
-    buttonSettings->setIcon(QIcon::fromTheme("preferences-other"));
+    QGroupBox *groupBox = new QGroupBox(this);
+    QVBoxLayout *groupLayout = new QVBoxLayout(groupBox);
+    
+    // TODO: TESTING
+    
+    /*mProfileModel = new QStringListModel();
+    QStringList profileList;
+    profileList << "Default" << "Warrior" << "Redemption" << "Cool stuff bro!";
+    mProfileModel->setStringList(profileList);
+    */
+    
+    // Various pages
+    mPlayPage = new PlayPage(this);
+    //mPlayPage->mProfileModel->setStringList(profileList);
+    
+    mDataFilesPage = new DataFilesPage(this);
+    //mDataFilesPage->mProfileComboBox->setModel(mProfileModel);
+    
+    mPagesWidget = new QStackedWidget(groupBox);
+    mPagesWidget->addWidget(mPlayPage);
+    mPagesWidget->addWidget(new PlayPage);
+    mPagesWidget->addWidget(mDataFilesPage);
+    //mPagesWidget->addWidget(new QueryPage);
+    
+    groupLayout->addWidget(mPagesWidget);
+
+    QPushButton *playButton = new QPushButton(tr("Play"));
 
     QDialogButtonBox *buttonBox = new QDialogButtonBox(this);
     buttonBox->setStandardButtons(QDialogButtonBox::Close);
-    buttonBox->addButton(buttonSettings, QDialogButtonBox::ActionRole);
-        
+    buttonBox->addButton(playButton, QDialogButtonBox::ActionRole);
+    
+    //QSpacerItem *vSpacer1 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+    
     QVBoxLayout *dialogLayout = new QVBoxLayout(this);
-    QVBoxLayout *buttonsLayout = new QVBoxLayout();
-    QHBoxLayout *bodyLayout = new QHBoxLayout();
-    QHBoxLayout *dialogButtonsLayout = new QHBoxLayout();
+    dialogLayout->addWidget(mIconWidget);
+    //dialogLayout->addItem(vSpacer1);
+    dialogLayout->addWidget(groupBox);
     
-    QSpacerItem *hSpacer1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-    QSpacerItem *hSpacer2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-    QSpacerItem *hSpacer3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-    
-    QSpacerItem *vSpacer1 = new QSpacerItem(40, 150, QSizePolicy::Minimum, QSizePolicy::Fixed);
-    QSpacerItem *vSpacer2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-    
-    buttonsLayout->addItem(vSpacer1);
-    buttonsLayout->addWidget(buttonStart);
-    buttonsLayout->addWidget(buttonDataFiles);
-    buttonsLayout->addItem(vSpacer2);
-    
-    bodyLayout->addItem(hSpacer1);
-    bodyLayout->addLayout(buttonsLayout);
-    bodyLayout->addItem(hSpacer2);
-    
-    dialogButtonsLayout->addItem(hSpacer3);
-    dialogButtonsLayout->addWidget(buttonBox);
-    
-    dialogLayout->addLayout(bodyLayout);
-    dialogLayout->addLayout(dialogButtonsLayout);
-    
-    setMinimumSize(QSize(400, 310));
-    setMaximumSize(QSize(400, 310));
+    dialogLayout->addWidget(buttonBox);
+    //mainLayout->addStretch(1);
+    //mainLayout->addSpacing(12);
 
     setWindowTitle(tr("OpenMW Launcher"));
-    QPixmap pixmap(":resources/openmw_icon.png");
-    setWindowIcon(QIcon(pixmap));
+    setMinimumSize(QSize(550, 450));
     
-    // Signals and slots
-    connect(buttonStart, SIGNAL(clicked()), this, SLOT(start()));
-    connect(buttonDataFiles, SIGNAL(clicked()), this, SLOT(showDataFiles()));
-    connect(buttonSettings, SIGNAL(clicked()), this, SLOT(showSettings()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(close()));
-    
-    openmw = new QProcess(NULL);
-
+    createIcons();
 }
 
-void MainDialog::start()
+void MainDialog::createIcons()
 {
-    // Start the game!
-    openmw->start("./openmw");
-    connect(openmw, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(finished(int, QProcess::ExitStatus)));  
+    //QSize itemSize(80, 66);
+    
+    QListWidgetItem *configButton = new QListWidgetItem(mIconWidget);
+    configButton->setIcon(QIcon(":resources/openmw-icon.png"));
+    configButton->setText(tr("Play"));
+    configButton->setTextAlignment(Qt::AlignCenter);
+    configButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+    //configButton->setSizeHint(itemSize);
+    
+    QListWidgetItem *updateButton = new QListWidgetItem(mIconWidget);
+    updateButton->setIcon(QIcon::fromTheme("video-display"));
+    updateButton->setText(tr("Graphics"));
+    updateButton->setTextAlignment(Qt::AlignHCenter | Qt::AlignBottom | Qt::AlignAbsolute);
+    updateButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+    //updateButton->setSizeHint(itemSize);
+    
+    QListWidgetItem *queryButton = new QListWidgetItem(mIconWidget);
+    queryButton->setIcon(QIcon(":resources/openmw-plugin-icon.png"));
+    queryButton->setText(tr("Data Files"));
+    queryButton->setTextAlignment(Qt::AlignHCenter | Qt::AlignBottom);
+    queryButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+
+    //queryButton->setSizeHint(itemSize);
+    
+    connect(mIconWidget,
+            SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
+            this, SLOT(changePage(QListWidgetItem*,QListWidgetItem*)));
 }
 
-void MainDialog::finished(int exitCode, QProcess::ExitStatus exitStatus)
+void MainDialog::changePage(QListWidgetItem *current, QListWidgetItem *previous)
 {
-    QString debuginfo = openmw->readAllStandardOutput();
-       
-    if (exitCode == 0 && exitStatus == QProcess::NormalExit) {
-        // Close the launcher if the game is quitted
-        close();
-    } 
-    
-    if (exitCode != 0) {
-        // An error occured whilst starting OpenMW
+    if (!current)
+        current = previous;
 
-        // First check if readAllStandardOutput is empty
-        // Finished gets signaled twice sometimes
+    mPagesWidget->setCurrentIndex(mIconWidget->row(current));
+    
+    if (previous) {
+        QString previousPage = previous->data(Qt::DisplayRole).toString();
+        QString currentPage = current->data(Qt::DisplayRole).toString();
         
-        if (!debuginfo.isEmpty())
-        {
-            QMessageBox msgBox;
-            msgBox.setWindowTitle("Error");
-            msgBox.setIcon(QMessageBox::Warning);
-            msgBox.setStandardButtons(QMessageBox::Ok);
-            msgBox.setText(tr("\nAn error occured while starting OpenMW."));
-            msgBox.setDetailedText(debuginfo);
-            msgBox.exec();   
+        // The user switched from Data Files to Play
+        if (previousPage == QString("Data Files") && currentPage == QString("Play")) {
+            mPlayPage->mProfileModel->setStringList(mDataFilesPage->mProfileModel->stringList());
+            mPlayPage->mProfileComboBox->setCurrentIndex(mDataFilesPage->mProfileComboBox->currentIndex());
+        }
+        
+        // The user switched from Play to Data Files
+        if (previousPage == QString("Play") && currentPage == QString("Data Files")) {
+            mDataFilesPage->mProfileComboBox->setCurrentIndex(mPlayPage->mProfileComboBox->currentIndex());
         }
-       
     }
+
 }
 
-void MainDialog::showDataFiles()
-{
-    DataFilesDialog dialog;
-    dialog.exec();
-}
-
-void MainDialog::showSettings()
-{
-    SettingsDialog dialog;
-    dialog.exec();
-}
diff --git a/apps/launcher/maindialog.h b/apps/launcher/maindialog.h
deleted file mode 100644
index db6911115..000000000
--- a/apps/launcher/maindialog.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef MAINDIALOG_H
-#define MAINDIALOG_H
-
-#include <QDialog>
-#include <QProcess>
-
-class MainDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    MainDialog();
-
-    QProcess *openmw;
-    
-public slots:
-
-    void start();
-    void showDataFiles();
-    void showSettings();
-    void finished(int, QProcess::ExitStatus exitStatus);
-
-};
-
-#endif
diff --git a/apps/launcher/resources.qrc b/apps/launcher/resources.qrc
index 111652357..9a36dfd36 100644
--- a/apps/launcher/resources.qrc
+++ b/apps/launcher/resources.qrc
@@ -1,7 +1,8 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
     <file>resources/clear.png</file>
-    <file>resources/openmw_header.png</file>
-    <file>resources/openmw_icon.png</file>
+    <file>resources/openmw-icon.png</file>
+    <file>resources/openmw-plugin-icon.png</file>
+    <file>resources/openmw-header.png</file>
 </qresource>
 </RCC>
diff --git a/apps/launcher/resources/openmw_header.png b/apps/launcher/resources/openmw_header.png
deleted file mode 100644
index a3045ce61..000000000
Binary files a/apps/launcher/resources/openmw_header.png and /dev/null differ
diff --git a/apps/launcher/resources/openmw_icon.png b/apps/launcher/resources/openmw_icon.png
deleted file mode 100644
index 7a5393821..000000000
Binary files a/apps/launcher/resources/openmw_icon.png and /dev/null differ