diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.cpp
index 7b00b9b22c..5b3c071bd2 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.cpp
@@ -49,6 +49,7 @@ void RicEditSummaryCurves::onActionTriggered(bool isChecked)
     RimProject* project = RiaApplication::instance()->project();
     CVF_ASSERT(project);
 
+/*
 	if (m_curveCreator == nullptr)
 	{
 		m_curveCreator = new RicSummaryCurveCreator();
@@ -56,9 +57,10 @@ void RicEditSummaryCurves::onActionTriggered(bool isChecked)
 	}
 	if(!m_dialog->isVisible())
 		m_dialog->show();
+*/
 
-
-    RicSummaryCurveCreatorUi summaryCurveCreator(nullptr, m_curveCreator);
+    RicSummaryCurveCreator curveCreator;
+    RicSummaryCurveCreatorUi summaryCurveCreator(nullptr, &curveCreator);
     summaryCurveCreator.exec();
 
 //    openSelector(summaryCase);
diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.h b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.h
index bea7ae43bc..7d54bcbb90 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.h
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCurves.h
@@ -40,6 +40,6 @@ protected:
     virtual void setupActionLook(QAction* actionToSetup);
 
 private:
-	RicSummaryCurveCreator*		m_curveCreator;
-    caf::PdmUiPropertyViewDialog* m_dialog;
+// 	RicSummaryCurveCreator*		m_curveCreator;
+//     caf::PdmUiPropertyViewDialog* m_dialog;
 };
diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
index 02e5ea394c..31d5de76fe 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
@@ -244,7 +244,184 @@ void RicSummaryCurveCreator::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
     caf::PdmUiGroup* itemTypesGroup = uiOrdering.addNewGroup("Items Types");
     itemTypesGroup->add(&m_selectedSummaryCategory);
 
+
+    RifEclipseSummaryAddress::SummaryVarCategory sumCategory = m_selectedSummaryCategory();
+    if (sumCategory == RifEclipseSummaryAddress::SUMMARY_FIELD)
+    {
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Blank");
+        }
+
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_FIELD][0]->pdmField());
+        }
+    }
+    else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_AQUIFER)
+    {
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Blank");
+        }
+
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_AQUIFER][0]->pdmField());
+        }
+    }
+    else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_NETWORK)
+    {
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Blank");
+        }
+
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_NETWORK][0]->pdmField());
+        }
+    }
+    else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_MISC)
+    {
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Blank");
+        }
+
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_MISC][0]->pdmField());
+        }
+    }
+    else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_REGION)
+    {
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Regions");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_REGION][0]->pdmField());
+        }
+
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_REGION][1]->pdmField());
+        }
+    }
+    else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION)
+    {
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Regions");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION][0]->pdmField());
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION][1]->pdmField());
+        }
+
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION][2]->pdmField());
+        }
+    }
+    else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_WELL_GROUP)
+    {
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Well Groups");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_GROUP][0]->pdmField());
+        }
+
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_GROUP][1]->pdmField());
+        }
+    }
+    else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_WELL)
+    {
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Wells");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL][0]->pdmField());
+        }
+
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL][1]->pdmField());
+        }
+    }
+    else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION)
+    {
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Wells");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION][0]->pdmField());
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION][1]->pdmField());
+        }
+
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION][2]->pdmField());
+        }
+    }
+    else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR)
+    {
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Wells");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR][0]->pdmField());
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR][1]->pdmField());
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR][2]->pdmField());
+        }
+
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR][3]->pdmField());
+        }
+    }
+    else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_WELL_LGR)
+    {
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Wells");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_LGR][0]->pdmField());
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_LGR][1]->pdmField());
+        }
+
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_LGR][2]->pdmField());
+        }
+    }
+    else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT)
+    {
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Wells");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT][0]->pdmField());
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT][1]->pdmField());
+        }
+
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT][2]->pdmField());
+        }
+    }
+    else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_BLOCK)
+    {
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Blocks");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_BLOCK][0]->pdmField());
+        }
+
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_BLOCK][1]->pdmField());
+        }
+    }
+    else if (sumCategory == RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR)
+    {
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Blocks");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR][0]->pdmField());
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR][1]->pdmField());
+        }
+
+        {
+            caf::PdmUiGroup* myGroup = uiOrdering.addNewGroup("Vectors");
+            myGroup->add(m_selectedIdentifiers[RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR][2]->pdmField());
+        }
+    }
+
+
+
     // Dynamic item input editors
+/*
     auto pdmFields = m_selectedIdentifiers[m_selectedSummaryCategory()];
     if (pdmFields.size() > 0)
     {
@@ -253,6 +430,8 @@ void RicSummaryCurveCreator::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
         for (const auto& pdmField : pdmFields)
             itemInputGroup->add(pdmField->pdmField());
     }
+*/
+
 
     caf::PdmUiGroup* curvesGroup = uiOrdering.addNewGroup("Curves");
     curvesGroup->add(&m_selectedCurves);
diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorUi.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorUi.cpp
index 5408bb0336..aa859fe136 100644
--- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorUi.cpp
+++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorUi.cpp
@@ -32,7 +32,7 @@ RicSummaryCurveCreatorUi::RicSummaryCurveCreatorUi(QWidget* parent, RicSummaryCu
     m_summaryCurveCreator(summaryCurveCreator)
 {
     m_customObjectEditor = new RiuCustomObjectEditor;
-    m_customObjectEditor->defineGridLayout(4, 2);
+    m_customObjectEditor->defineGridLayout(2, 4);
 
     QWidget* propertyWidget = m_customObjectEditor->getOrCreateWidget(this);