diff --git a/ApplicationCode/Application/RiaPreferences.cpp b/ApplicationCode/Application/RiaPreferences.cpp
index 0559855ae0..b3b1b0a59b 100644
--- a/ApplicationCode/Application/RiaPreferences.cpp
+++ b/ApplicationCode/Application/RiaPreferences.cpp
@@ -25,6 +25,7 @@
 #include "RifReaderSettings.h"
 
 #include "cafPdmFieldCvfColor.h"
+#include "cafPdmUiComboBoxEditor.h"
 #include "cafPdmUiCheckBoxEditor.h"
 #include "cafPdmUiFieldHandle.h"
 #include "cafPdmUiFilePathEditor.h"
@@ -123,7 +124,7 @@ RiaPreferences::RiaPreferences(void)
     CAF_PDM_InitField(&m_showProjectChangedDialog, "showProjectChangedDialog", true, "Show 'Project has changed' dialog", "", "", "");
     m_showProjectChangedDialog.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
 
-    CAF_PDM_InitField(&m_showOctaveWarningForMultipleInstances, "showOctaveWarningForMultipleInstances", true, "Show Octave communication warning when multiple instances are created", "", "", "");
+    CAF_PDM_InitField(&m_showOctaveWarningForMultipleInstances, "showOctaveWarningForMultipleInstances", true, "Show Octave warning when multiple instances are created", "", "", "");
     m_showOctaveWarningForMultipleInstances.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
 
     CAF_PDM_InitFieldNoDefault(&m_readerSettings,        "readerSettings", "Reader Settings", "", "", "");
@@ -191,6 +192,12 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt
             myAttr->m_selectDirectory = true;
         }
     }
+    if (field == &defaultSceneFontSize || field == &defaultWellLabelFontSize ||
+        field == &defaultAnnotationFontSize || field == &defaultPlotFontSize)
+    {
+        caf::PdmUiComboBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiComboBoxEditorAttribute*>(attribute);
+        myAttr->minimumContentsLength = 2;
+    }
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -202,16 +209,16 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
     {
         caf::PdmUiGroup* colorGroup = uiOrdering.addNewGroup("Default Colors");
         colorGroup->add(&defaultViewerBackgroundColor);
-        colorGroup->add(&defaultGridLineColors);
+        colorGroup->add(&defaultGridLineColors, false);
         colorGroup->add(&defaultFaultGridLineColors);
-        colorGroup->add(&defaultWellLabelColor);
-
+        colorGroup->add(&defaultWellLabelColor, false);
+        
         caf::PdmUiGroup* fontGroup = uiOrdering.addNewGroup("Default Font Sizes");
         fontGroup->add(&defaultSceneFontSize);
         fontGroup->add(&defaultAnnotationFontSize, false);
         fontGroup->add(&defaultWellLabelFontSize);
         fontGroup->add(&defaultPlotFontSize, false);
-
+        
         caf::PdmUiGroup* viewsGroup = uiOrdering.addNewGroup("3d Views");
         viewsGroup->add(&defaultMeshModeType);
         viewsGroup->add(&navigationPolicy);
@@ -232,7 +239,7 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
         newCaseBehaviourGroup->add(&loadAndShowSoil);
     
         m_readerSettings->defineUiOrdering(uiConfigName, *newCaseBehaviourGroup);
-
+        
         caf::PdmUiGroup* restartBehaviourGroup = uiOrdering.addNewGroup("Origin Files");
         restartBehaviourGroup->add(&summaryRestartFilesShowImportDialog);
         caf::PdmUiGroup* summaryImportOptionGroup = restartBehaviourGroup->addNewGroup("Origin Summary Files");
diff --git a/ApplicationCode/UserInterface/RiuPropertyViewTabWidget.cpp b/ApplicationCode/UserInterface/RiuPropertyViewTabWidget.cpp
index 4589b5e3e3..e1c17e2205 100644
--- a/ApplicationCode/UserInterface/RiuPropertyViewTabWidget.cpp
+++ b/ApplicationCode/UserInterface/RiuPropertyViewTabWidget.cpp
@@ -37,7 +37,7 @@ RiuPropertyViewTabWidget::RiuPropertyViewTabWidget(QWidget* parent, caf::PdmObje
     setWindowTitle(windowTitle);
 
     QTabWidget* tabWidget = new QTabWidget;
-
+    
     for (int i = 0; i < uiConfigNameForTabs.size(); i++)
     {
         QHBoxLayout* widgetLayout = new QHBoxLayout;
@@ -68,6 +68,7 @@ RiuPropertyViewTabWidget::RiuPropertyViewTabWidget(QWidget* parent, caf::PdmObje
     connect(m_dialogButtonBox, SIGNAL(rejected()), this, SLOT(reject()));
 
     dialogLayout->addWidget(m_dialogButtonBox);
+
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -81,13 +82,31 @@ RiuPropertyViewTabWidget::~RiuPropertyViewTabWidget()
     }
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QSize RiuPropertyViewTabWidget::minimumSizeHint() const
+{
+    QSize maxSizeHint(0, 0);
+
+    for (auto w : m_pageWidgets)
+    {
+        QSize pageSize = w->minimumSizeHint();
+        pageSize += QSize(0, 100);
+
+        maxSizeHint = maxSizeHint.expandedTo(pageSize);
+    }
+
+    return maxSizeHint;
+
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
 QSize RiuPropertyViewTabWidget::sizeHint() const
 {
-    QSize maxSizeHint = QDialog::sizeHint();
-    //qDebug() << "dialog size hint : " << maxSizeHint;
+    QSize maxSizeHint(0, 0);
 
     for (auto w : m_pageWidgets)
     {
diff --git a/ApplicationCode/UserInterface/RiuPropertyViewTabWidget.h b/ApplicationCode/UserInterface/RiuPropertyViewTabWidget.h
index d9a9673658..b984b127cc 100644
--- a/ApplicationCode/UserInterface/RiuPropertyViewTabWidget.h
+++ b/ApplicationCode/UserInterface/RiuPropertyViewTabWidget.h
@@ -37,6 +37,7 @@ public:
     RiuPropertyViewTabWidget(QWidget* parent, caf::PdmObject* object, const QString& windowTitle, const QStringList& uiConfigNameForTabs);
     ~RiuPropertyViewTabWidget() override;
 
+    QSize minimumSizeHint() const override;
     QSize sizeHint() const override;
     QDialogButtonBox* dialogButtonBox();
 private: