diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 0ee7c1aea..02a6c25a0 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -109,8 +109,6 @@ opencs_units (view/settings
     rangeview
     resizeablestackedwidget
     spinbox
-    clickspinbox
-    clickcombobox
     )
 
 opencs_units_noqt (view/settings
@@ -168,7 +166,7 @@ qt4_wrap_ui(OPENCS_UI_HDR ${OPENCS_UI})
 qt4_wrap_cpp(OPENCS_MOC_SRC ${OPENCS_HDR_QT})
 qt4_add_resources(OPENCS_RES_SRC ${OPENCS_RES})
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR} view/settings)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 if(APPLE)
     set (OPENCS_MAC_ICON ${CMAKE_SOURCE_DIR}/files/mac/opencs.icns)
diff --git a/apps/opencs/view/settings/clickcombobox.cpp b/apps/opencs/view/settings/clickcombobox.cpp
deleted file mode 100644
index f313ffe84..000000000
--- a/apps/opencs/view/settings/clickcombobox.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "clickcombobox.hpp"
-
-#include <QMouseEvent>
-
-void ClickComboBox::mouseReleaseEvent(QMouseEvent *e)
-{
-    emit mouseReleased();
-}
-
diff --git a/apps/opencs/view/settings/clickcombobox.hpp b/apps/opencs/view/settings/clickcombobox.hpp
deleted file mode 100644
index f3385f407..000000000
--- a/apps/opencs/view/settings/clickcombobox.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef CSVSETTINGS_CLICKCOMBOBOX_H
-#define CSVSETTINGS_CLICKCOMBOBOX_H
-
-#include <QComboBox>
-#include <QMouseEvent>
-
-class ClickComboBox : public QComboBox
-{
-    Q_OBJECT
-
-    public:
-        explicit ClickComboBox(QWidget *parent = 0) { }
-        void mouseReleaseEvent(QMouseEvent *e);
-
-    signals:
-        void mouseReleased();
-
-};
-
-#endif /* CSVSETTINGS_CLICKCOMBOBOX_H */
diff --git a/apps/opencs/view/settings/clickspinbox.cpp b/apps/opencs/view/settings/clickspinbox.cpp
deleted file mode 100644
index e94b9b3d0..000000000
--- a/apps/opencs/view/settings/clickspinbox.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "clickspinbox.hpp"
-
-#include <QMouseEvent>
-#include <iostream>
-
-void ClickSpinBox::mouseReleaseEvent(QMouseEvent *e)
-{
-    std::cout << "emit" << std::endl;
-    emit mouseReleased();
-}
-
diff --git a/apps/opencs/view/settings/clickspinbox.hpp b/apps/opencs/view/settings/clickspinbox.hpp
deleted file mode 100644
index 0db534e51..000000000
--- a/apps/opencs/view/settings/clickspinbox.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef CSVSETTINGS_CLICKSPINBOX_H
-#define CSVSETTINGS_CLICKSPINBOX_H
-
-#include <QSpinBox>
-#include <QMouseEvent>
-
-class ClickSpinBox : public QSpinBox
-{
-    Q_OBJECT
-
-    public:
-        explicit ClickSpinBox(QWidget *parent = 0) { }
-        void mouseReleaseEvent(QMouseEvent *e);
-
-    signals:
-        void mouseReleased();
-
-};
-
-#endif /* CSVSETTINGS_CLICKSPINBOX_H */
diff --git a/apps/opencs/view/settings/settingsdialog.cpp b/apps/opencs/view/settings/settingsdialog.cpp
index 34a6c5527..4c426ff6d 100644
--- a/apps/opencs/view/settings/settingsdialog.cpp
+++ b/apps/opencs/view/settings/settingsdialog.cpp
@@ -144,75 +144,90 @@ CSVSettings::SettingsDialog::SettingsDialog(QTabWidget *parent)
 
     // Set the maximum res we can set in windowed mode
     QRect res = getMaximumResolution();
-    spinBox_x->setMaximum(res.width());
-    spinBox_y->setMaximum(res.height());
+    sbWidth->setMaximum(res.width());
+    sbHeight->setMaximum(res.height());
 
-    connect(checkBox_override, SIGNAL(toggled(bool)), this, SLOT(slotOverrideToggled(bool)));
-    connect(comboBox_rendersystem, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(slotRendererChanged(const QString&)));
-    connect(radioButton_standard_res, SIGNAL(toggled(bool)), this, SLOT(slotStandardToggled(bool)));
+    // to enable mouse events on disabled widgets
+    cmbStdWinSize->installEventFilter(this);
+    sbWidth->installEventFilter(this);
+    sbHeight->installEventFilter(this);
 
-    connect(comboBox_std_window_size, SIGNAL(mouseReleased()), this, SLOT(slotStandardClicked()));
-    connect(spinBox_x, SIGNAL(mouseReleased()), this, SLOT(slotCustomClicked()));
-    connect(spinBox_y, SIGNAL(mouseReleased()), this, SLOT(slotCustomClicked()));
+    connect(cbOverride, SIGNAL(toggled(bool)), this, SLOT(slotOverrideToggled(bool)));
+    connect(cmbRenderSys, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(slotRendererChanged(const QString&)));
+    connect(rbStdWinSize, SIGNAL(toggled(bool)), this, SLOT(slotStandardToggled(bool)));
 }
 
-void CSVSettings::SettingsDialog::slotStandardClicked()
+bool CSVSettings::SettingsDialog::eventFilter(QObject *target, QEvent *event)
 {
-    std::cout << "click" << std::endl;
-    if(!radioButton_standard_res->isChecked())
-        radioButton_standard_res->toggle();
-}
+    QWidget *item = qobject_cast<QWidget *>(target);
+    if (target == cmbStdWinSize)
+    {
+        if (!item->isEnabled() && (event->type() == QEvent::MouseButtonRelease))
+        {
+            rbCustWinSize->setChecked(false);
+            rbStdWinSize->setChecked(true);
+            slotStandardToggled(true);
 
-void CSVSettings::SettingsDialog::slotCustomClicked()
-{
-    std::cout << "click" << std::endl;
-    if(radioButton_standard_res->isChecked())
-        radioButton_standard_res->toggle();
+            return false;
+        }
+    }
+    else if (target == sbWidth || target == sbHeight)
+    {
+        if (!item->isEnabled() && (event->type() == QEvent::MouseButtonPress))
+        {
+            rbStdWinSize->setChecked(false);
+            rbCustWinSize->setChecked(true);
+            slotStandardToggled(false);
+
+            return false;
+        }
+    }
+    return QTabWidget::eventFilter(target, event);
 }
 
 void CSVSettings::SettingsDialog::slotRendererChanged(const QString &renderer)
 {
-    comboBox_antialiasing->clear();
-    comboBox_antialiasing->addItems(mModel->getOgreOptions(QString("FSAA"), renderer));
+    cmbAntiAlias->clear();
+    cmbAntiAlias->addItems(mModel->getOgreOptions(QString("FSAA"), renderer));
 
-    comboBox_shaderlanguage->clear();
-    comboBox_shaderlanguage->addItems(mModel->getShaderLanguageByRenderer(renderer));
+    cmbShaderLang->clear();
+    cmbShaderLang->addItems(mModel->getShaderLanguageByRenderer(renderer));
 
     if(mModel->settingValue("Video/use settings.cfg") == "true")
     {
-        label_RenderingSubsystem->setEnabled(false);
-        comboBox_rendersystem->setEnabled(false);
-        label_Antialiasing->setEnabled(false);
-        comboBox_antialiasing->setEnabled(false);
-        checkBox_vsync->setEnabled(false);
-        label_ShaderLanguage->setEnabled(false);
-        comboBox_shaderlanguage->setEnabled(false);
+        labRenderSys->setEnabled(false);
+        cmbRenderSys->setEnabled(false);
+        labAntiAlias->setEnabled(false);
+        cmbAntiAlias->setEnabled(false);
+        cbVsync->setEnabled(false);
+        labShaderLang->setEnabled(false);
+        cmbShaderLang->setEnabled(false);
     }
     else
-        checkBox_override->setChecked(false);
+        cbOverride->setChecked(false);
 }
 
 void CSVSettings::SettingsDialog::slotOverrideToggled(bool checked)
 {
     if(checked)
     {
-        label_RenderingSubsystem->setEnabled(false);
-        comboBox_rendersystem->setEnabled(false);
-        label_Antialiasing->setEnabled(false);
-        comboBox_antialiasing->setEnabled(false);
-        checkBox_vsync->setEnabled(false);
-        label_ShaderLanguage->setEnabled(false);
-        comboBox_shaderlanguage->setEnabled(false);
+        labRenderSys->setEnabled(false);
+        cmbRenderSys->setEnabled(false);
+        labAntiAlias->setEnabled(false);
+        cmbAntiAlias->setEnabled(false);
+        cbVsync->setEnabled(false);
+        labShaderLang->setEnabled(false);
+        cmbShaderLang->setEnabled(false);
     }
     else
     {
-        label_RenderingSubsystem->setEnabled(true);
-        comboBox_rendersystem->setEnabled(true);
-        label_Antialiasing->setEnabled(true);
-        comboBox_antialiasing->setEnabled(true);
-        checkBox_vsync->setEnabled(true);
-        label_ShaderLanguage->setEnabled(true);
-        comboBox_shaderlanguage->setEnabled(true);
+        labRenderSys->setEnabled(true);
+        cmbRenderSys->setEnabled(true);
+        labAntiAlias->setEnabled(true);
+        cmbAntiAlias->setEnabled(true);
+        cbVsync->setEnabled(true);
+        labShaderLang->setEnabled(true);
+        cmbShaderLang->setEnabled(true);
     }
 }
 
@@ -220,15 +235,15 @@ void CSVSettings::SettingsDialog::slotStandardToggled(bool checked)
 {
     if (checked)
     {
-        comboBox_std_window_size->setEnabled(true);
-        spinBox_x->setEnabled(false);
-        spinBox_y->setEnabled(false);
+        cmbStdWinSize->setEnabled(true);
+        sbWidth->setEnabled(false);
+        sbHeight->setEnabled(false);
     }
     else
     {
-        comboBox_std_window_size->setEnabled(false);
-        spinBox_x->setEnabled(true);
-        spinBox_y->setEnabled(true);
+        cmbStdWinSize->setEnabled(false);
+        sbWidth->setEnabled(true);
+        sbHeight->setEnabled(true);
     }
 }
 
@@ -237,54 +252,54 @@ void CSVSettings::SettingsDialog::setViewValues()
     int index = -1;
 
     // initialised in the constructor
-    slotOverrideToggled(checkBox_override->isChecked());
+    slotOverrideToggled(cbOverride->isChecked());
 
     // Ogre initialised earlier
     slotRendererChanged(Ogre::Root::getSingleton().getRenderSystem()->getName().c_str());
 
     // antialiasing
     QString antialiasing = mModel->settingValue("Video/antialiasing");
-    index = comboBox_antialiasing->findData(antialiasing, Qt::DisplayRole);
+    index = cmbAntiAlias->findData(antialiasing, Qt::DisplayRole);
     if(index != -1)
-        comboBox_antialiasing->setCurrentIndex(index);
+        cmbAntiAlias->setCurrentIndex(index);
 
     // vsync
-    checkBox_vsync->setChecked(mModel->settingValue("Video/vsync") == "true");
+    cbVsync->setChecked(mModel->settingValue("Video/vsync") == "true");
 
     // shader lang
     QString shaderlang = mModel->settingValue("Shader/language");
-    index = comboBox_shaderlanguage->findData(shaderlang, Qt::DisplayRole);
+    index = cmbShaderLang->findData(shaderlang, Qt::DisplayRole);
     if(index != -1)
-        comboBox_shaderlanguage->setCurrentIndex(index);
+        cmbShaderLang->setCurrentIndex(index);
 
     if(mModel->settingValue("Window Size/Width") != "")
-        spinBox_x->setValue(mModel->settingValue("Window Size/Width").toInt());
+        sbWidth->setValue(mModel->settingValue("Window Size/Width").toInt());
 
     if(mModel->settingValue("Window Size/Height") != "")
-        spinBox_y->setValue(mModel->settingValue("Window Size/Height").toInt());
+        sbHeight->setValue(mModel->settingValue("Window Size/Height").toInt());
 
     // update display resolution combo box
-    comboBox_std_window_size->clear();
-    comboBox_std_window_size->addItems(getAvailableResolutions());
+    cmbStdWinSize->clear();
+    cmbStdWinSize->addItems(getAvailableResolutions());
 
     QString currRes = mModel->settingValue("Window Size/Width") + " x " +
                       mModel->settingValue("Window Size/Height");
 
-    index = comboBox_std_window_size->findData(currRes, Qt::DisplayRole, Qt::MatchStartsWith);
+    index = cmbStdWinSize->findData(currRes, Qt::DisplayRole, Qt::MatchStartsWith);
     if(index != -1)
     {
         // show the values in ini file
-        comboBox_std_window_size->setCurrentIndex(index);
+        cmbStdWinSize->setCurrentIndex(index);
         slotStandardToggled(true);
     }
     else
     {
         // show what's in Ogre instead
-        index = comboBox_std_window_size->findData(getCurrentOgreResolution(), Qt::DisplayRole, Qt::MatchStartsWith);
+        index = cmbStdWinSize->findData(getCurrentOgreResolution(), Qt::DisplayRole, Qt::MatchStartsWith);
         if(index != -1)
-            comboBox_std_window_size->setCurrentIndex(index);
+            cmbStdWinSize->setCurrentIndex(index);
 
-        radioButton_custom_res->setChecked(true);
+        rbCustWinSize->setChecked(true);
         slotStandardToggled(false);
     }
 }
@@ -307,39 +322,39 @@ void CSVSettings::SettingsDialog::saveSettings()
     std::cout << "closeEvent" << std::endl;
 
     // override
-    if(checkBox_override->isChecked())
+    if(cbOverride->isChecked())
         mModel->setDefinitions("Video/use settings.cfg", QStringList("true"));
     else
         mModel->setDefinitions("Video/use settings.cfg", QStringList("false"));
 
     // render system
     mModel->setDefinitions("Video/render system",
-                           QStringList(comboBox_rendersystem->currentText()));
+                           QStringList(cmbRenderSys->currentText()));
 
     // vsync
-    if(checkBox_vsync->isChecked())
+    if(cbVsync->isChecked())
         mModel->setDefinitions("Video/vsync", QStringList("true"));
     else
         mModel->setDefinitions("Video/vsync", QStringList("false"));
 
     // antialiasing
     mModel->setDefinitions("Video/antialiasing",
-                           QStringList(comboBox_antialiasing->currentText()));
+                           QStringList(cmbAntiAlias->currentText()));
 #if 0
     QRegExp reAA("^\\D*(\\d+)\\D*");
-    if(reAA.indexIn(comboBox_antialiasing->currentText()) > -1)
+    if(reAA.indexIn(cmbAntiAlias->currentText()) > -1)
         mModel->setDefinitions("Video/antialiasing", QStringList(reAA.cap(1)));
 #endif
 
     // shader lang
     mModel->setDefinitions("Shader/language",
-                           QStringList(comboBox_shaderlanguage->currentText()));
+                           QStringList(cmbShaderLang->currentText()));
 
     // window size
-    if(radioButton_standard_res->isChecked())
+    if(rbStdWinSize->isChecked())
     {
         QRegExp re("^(\\d+) x (\\d+)");
-        if(re.indexIn(comboBox_std_window_size->currentText()) > -1)
+        if(re.indexIn(cmbStdWinSize->currentText()) > -1)
         {
             mModel->setDefinitions("Window Size/Width", QStringList(re.cap(1)));
             mModel->setDefinitions("Window Size/Height", QStringList(re.cap(2)));
@@ -348,9 +363,9 @@ void CSVSettings::SettingsDialog::saveSettings()
     else
     {
         mModel->setDefinitions("Window Size/Width",
-                               QStringList(QString::number(spinBox_x->value())));
+                               QStringList(QString::number(sbWidth->value())));
         mModel->setDefinitions("Window Size/Height",
-                               QStringList(QString::number(spinBox_y->value())));
+                               QStringList(QString::number(sbHeight->value())));
     }
 
     mModel->saveDefinitions();
diff --git a/apps/opencs/view/settings/settingsdialog.hpp b/apps/opencs/view/settings/settingsdialog.hpp
index 737ebdb07..07f5ebf24 100644
--- a/apps/opencs/view/settings/settingsdialog.hpp
+++ b/apps/opencs/view/settings/settingsdialog.hpp
@@ -36,6 +36,8 @@ namespace CSVSettings {
         /// Settings are written on close
         void closeEvent (QCloseEvent *event);
 
+        bool eventFilter(QObject *target, QEvent *event);
+
     private:
 
         ///sets the defined values for the views that have been created
@@ -48,8 +50,8 @@ namespace CSVSettings {
 
         void show();
 
-        void slotStandardClicked();
-        void slotCustomClicked();
+        //void slotStandardClicked();
+        //void slotCustomClicked();
         void slotRendererChanged(const QString &renderer);
         void slotOverrideToggled(bool checked);
         void slotStandardToggled(bool checked);
diff --git a/files/ui/settingstab.ui b/files/ui/settingstab.ui
index 51566869a..2cef67b0e 100644
--- a/files/ui/settingstab.ui
+++ b/files/ui/settingstab.ui
@@ -20,104 +20,6 @@
    <attribute name="title">
     <string>Video Settings</string>
    </attribute>
-   <widget class="QWidget" name="layoutWidget_Screen">
-    <property name="geometry">
-     <rect>
-      <x>20</x>
-      <y>188</y>
-      <width>351</width>
-      <height>51</height>
-     </rect>
-    </property>
-    <layout class="QGridLayout" name="gridLayout_Screen">
-     <item row="1" column="3">
-      <widget class="ClickSpinBox" name="spinBox_y">
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="2">
-      <widget class="ClickSpinBox" name="spinBox_x">
-       <property name="maximumSize">
-        <size>
-         <width>186</width>
-         <height>16777215</height>
-        </size>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2" colspan="2">
-      <widget class="ClickComboBox" name="comboBox_std_window_size">
-       <property name="minimumSize">
-        <size>
-         <width>180</width>
-         <height>0</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QRadioButton" name="radioButton_custom_res">
-       <property name="text">
-        <string>Custom:</string>
-       </property>
-       <attribute name="buttonGroup">
-        <string notr="true">buttonGroup</string>
-       </attribute>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QLabel" name="label_Resolution">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0">
-      <widget class="QRadioButton" name="radioButton_standard_res">
-       <property name="text">
-        <string>Standard:</string>
-       </property>
-       <property name="checked">
-        <bool>true</bool>
-       </property>
-       <attribute name="buttonGroup">
-        <string notr="true">buttonGroup</string>
-       </attribute>
-      </widget>
-     </item>
-    </layout>
-   </widget>
-   <widget class="QGroupBox" name="renderGroup">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>8</y>
-      <width>371</width>
-      <height>156</height>
-     </rect>
-    </property>
-    <property name="title">
-     <string>Render System</string>
-    </property>
-   </widget>
-   <widget class="QGroupBox" name="displayGroup">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>170</y>
-      <width>371</width>
-      <height>81</height>
-     </rect>
-    </property>
-    <property name="title">
-     <string>Window Size</string>
-    </property>
-   </widget>
    <widget class="QWidget" name="layoutWidget_Render">
     <property name="geometry">
      <rect>
@@ -129,7 +31,7 @@
     </property>
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0" colspan="2">
-      <widget class="QCheckBox" name="checkBox_override">
+      <widget class="QCheckBox" name="cbOverride">
        <property name="text">
         <string>Use Render System Settings from OpenMW</string>
        </property>
@@ -139,14 +41,14 @@
       </widget>
      </item>
      <item row="2" column="0">
-      <widget class="QLabel" name="label_RenderingSubsystem">
+      <widget class="QLabel" name="labRenderSys">
        <property name="text">
         <string>Rendering Subsystem</string>
        </property>
       </widget>
      </item>
      <item row="2" column="1">
-      <widget class="QComboBox" name="comboBox_rendersystem">
+      <widget class="QComboBox" name="cmbRenderSys">
        <property name="editable">
         <bool>false</bool>
        </property>
@@ -163,28 +65,28 @@
       </widget>
      </item>
      <item row="4" column="0">
-      <widget class="QLabel" name="label_Antialiasing">
+      <widget class="QLabel" name="labAntiAlias">
        <property name="text">
         <string>Antialiasing</string>
        </property>
       </widget>
      </item>
      <item row="3" column="0">
-      <widget class="QCheckBox" name="checkBox_vsync">
+      <widget class="QCheckBox" name="cbVsync">
        <property name="text">
         <string>Vertical Sync</string>
        </property>
       </widget>
      </item>
      <item row="5" column="0">
-      <widget class="QLabel" name="label_ShaderLanguage">
+      <widget class="QLabel" name="labShaderLang">
        <property name="text">
         <string>Shader Language</string>
        </property>
       </widget>
      </item>
      <item row="5" column="1">
-      <widget class="QComboBox" name="comboBox_shaderlanguage">
+      <widget class="QComboBox" name="cmbShaderLang">
        <item>
         <property name="text">
          <string>GLSL</string>
@@ -198,7 +100,7 @@
       </widget>
      </item>
      <item row="4" column="1">
-      <widget class="QComboBox" name="comboBox_antialiasing"/>
+      <widget class="QComboBox" name="cmbAntiAlias"/>
      </item>
      <item row="1" column="0" colspan="2">
       <widget class="Line" name="line">
@@ -218,10 +120,108 @@
      </item>
     </layout>
    </widget>
-   <zorder>renderGroup</zorder>
+   <widget class="QWidget" name="layoutWidget_Window">
+    <property name="geometry">
+     <rect>
+      <x>20</x>
+      <y>188</y>
+      <width>351</width>
+      <height>51</height>
+     </rect>
+    </property>
+    <layout class="QGridLayout" name="gridLayout_Window">
+     <item row="1" column="3">
+      <widget class="QSpinBox" name="sbHeight">
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="2">
+      <widget class="QSpinBox" name="sbWidth">
+       <property name="maximumSize">
+        <size>
+         <width>186</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2" colspan="2">
+      <widget class="QComboBox" name="cmbStdWinSize">
+       <property name="minimumSize">
+        <size>
+         <width>180</width>
+         <height>0</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QRadioButton" name="rbCustWinSize">
+       <property name="text">
+        <string>Custom:</string>
+       </property>
+       <attribute name="buttonGroup">
+        <string notr="true">buttonGroup</string>
+       </attribute>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLabel" name="label_Resolution">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QRadioButton" name="rbStdWinSize">
+       <property name="text">
+        <string>Standard:</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
+       <attribute name="buttonGroup">
+        <string notr="true">buttonGroup</string>
+       </attribute>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+   <widget class="QGroupBox" name="displayGroup_Render">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>8</y>
+      <width>371</width>
+      <height>156</height>
+     </rect>
+    </property>
+    <property name="title">
+     <string>Render System</string>
+    </property>
+   </widget>
+   <widget class="QGroupBox" name="displayGroup_Window">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>170</y>
+      <width>371</width>
+      <height>81</height>
+     </rect>
+    </property>
+    <property name="title">
+     <string>Window Size</string>
+    </property>
+   </widget>
+   <zorder>displayGroup_Render</zorder>
    <zorder>layoutWidget_Render</zorder>
-   <zorder>displayGroup</zorder>
-   <zorder>layoutWidget_Screen</zorder>
+   <zorder>displayGroup_Window</zorder>
+   <zorder>layoutWidget_Window</zorder>
   </widget>
   <widget class="QWidget" name="DisplaySetttings">
    <attribute name="title">
@@ -360,18 +360,6 @@
    </attribute>
   </widget>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>ClickSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header>clickspinbox.hpp</header>
-  </customwidget>
-  <customwidget>
-   <class>ClickComboBox</class>
-   <extends>QComboBox</extends>
-   <header>clickcombobox.hpp</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
  <buttongroups>