diff --git a/ApplicationLibCode/Commands/GeoMechCommands/RicNewWellIntegrityAnalysisFeature.cpp b/ApplicationLibCode/Commands/GeoMechCommands/RicNewWellIntegrityAnalysisFeature.cpp
index 2755fa3428..851b1c3825 100644
--- a/ApplicationLibCode/Commands/GeoMechCommands/RicNewWellIntegrityAnalysisFeature.cpp
+++ b/ApplicationLibCode/Commands/GeoMechCommands/RicNewWellIntegrityAnalysisFeature.cpp
@@ -105,5 +105,6 @@ void RicNewWellIntegrityAnalysisFeature::setupActionLook( QAction* actionToSetup
 //--------------------------------------------------------------------------------------------------
 bool RicNewWellIntegrityAnalysisFeature::isCommandEnabled()
 {
-    return true;
+    RimGeoMechView* view = dynamic_cast<RimGeoMechView*>( RiaApplication::instance()->activeGridView() );
+    return ( view != nullptr );
 }
diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp
index 8c504c55f3..260f3203be 100644
--- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultInViewCollection.cpp
@@ -99,6 +99,7 @@ RimFaultInViewCollection::RimFaultInViewCollection()
 
     CAF_PDM_InitFieldNoDefault( &m_faultRASettings, "FaultRASettings", "Reactivation Assessment Settings", "", "", "" );
     m_faultRASettings = new RimFaultRASettings();
+    m_faultRASettings.uiCapability()->setUiHidden( true );
     m_faultRASettings.uiCapability()->setUiTreeHidden( true );
 }
 
@@ -325,6 +326,13 @@ void RimFaultInViewCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiT
         auto uiTree = eclipseView->faultResultSettings()->uiTreeOrdering();
         uiTreeOrdering.appendChild( uiTree );
     }
+
+    for ( const auto& fault : faults )
+    {
+        uiTreeOrdering.add( fault );
+    }
+
+    uiTreeOrdering.skipRemainingChildren( true );
 }
 
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp
index 9bdd6a342c..76c71e509a 100644
--- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp
+++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp
@@ -40,6 +40,7 @@
 #include "cafPdmUiComboBoxEditor.h"
 #include "cafPdmUiFilePathEditor.h"
 #include "cafPdmUiTableViewEditor.h"
+#include "cafPdmUiTreeOrdering.h"
 
 #include <QFileInfo>
 
@@ -169,6 +170,16 @@ void RimFaultRASettings::defineUiOrdering( QString uiConfigName, caf::PdmUiOrder
     uiOrdering.skipRemainingFields( true );
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RimFaultRASettings::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName )
+{
+    uiTreeOrdering.add( &m_basicParameters );
+    uiTreeOrdering.add( &m_advancedParameters );
+    uiTreeOrdering.skipRemainingChildren();
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
diff --git a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.h b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.h
index bc5e683eba..94d7b96225 100644
--- a/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.h
+++ b/ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.h
@@ -89,7 +89,9 @@ public:
     RimGenericParameter* getInputParameter( QString name ) const;
 
 protected:
-    void                          defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
+    void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
+    void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName ) override;
+
     QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
                                                          bool*                      useOptionsOnly ) override;
 
diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettingsCollection.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettingsCollection.cpp
index 0917c5874f..fa8042fbf7 100644
--- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettingsCollection.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettingsCollection.cpp
@@ -25,6 +25,7 @@
 #include "RimProject.h"
 #include "RimWellIASettings.h"
 #include "RimWellPath.h"
+
 #include "cafPdmFieldScriptingCapability.h"
 #include "cafPdmObjectScriptingCapability.h"
 
@@ -40,6 +41,7 @@ RimWellIASettingsCollection::RimWellIASettingsCollection()
     CAF_PDM_InitObject( "Integrity Analysis Models", ":/WellIntAnalysis.png", "", "" );
 
     CAF_PDM_InitFieldNoDefault( &m_wellIASettings, "WellIASettings", "Settings", "", "", "" );
+    m_wellIASettings.uiCapability()->setUiHidden( true );
     m_wellIASettings.uiCapability()->setUiTreeHidden( true );
 
     setDeletable( true );
diff --git a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp
index a41fef02a2..c84d6c8ee0 100644
--- a/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp
+++ b/ApplicationLibCode/ProjectDataModel/WellPath/RimWellPath.cpp
@@ -141,7 +141,6 @@ RimWellPath::RimWellPath()
 
     CAF_PDM_InitFieldNoDefault( &m_wellIASettingsCollection, "WellIASettings", "Integrity Analysis Settings", "", "", "" );
     m_wellIASettingsCollection = new RimWellIASettingsCollection();
-    m_wellIASettingsCollection->uiCapability()->setUiTreeHidden( true );
 
     this->setDeletable( true );
 }