diff --git a/Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepCtUsRegistration.ui b/Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepCtUsRegistration.ui
index 0d2884e4d0..2bb7965e2d 100644
--- a/Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepCtUsRegistration.ui
+++ b/Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/NavigationStepWidgets/QmitkUSNavigationStepCtUsRegistration.ui
@@ -1,384 +1,475 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkUSNavigationStepCtUsRegistration</class>
  <widget class="QWidget" name="QmitkUSNavigationStepCtUsRegistration">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>412</width>
+    <width>750</width>
     <height>933</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QGroupBox" name="optionsGroupBox">
-     <property name="title">
-      <string>Options</string>
+    <widget class="QToolBox" name="toolBox">
+     <property name="currentIndex">
+      <number>1</number>
      </property>
-     <layout class="QFormLayout" name="formLayout">
-      <item row="0" column="0">
-       <widget class="QRadioButton" name="fiducialDiameter5mmRadioButton">
-        <property name="text">
-         <string>5mm Fiducial Diameter</string>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QRadioButton" name="fiducialDiameter3mmRadioButton">
-        <property name="text">
-         <string>3mm Fiducial Diameter</string>
-        </property>
-        <property name="checked">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="selectFiducialMarkerConfigurationLabel">
-        <property name="text">
-         <string>Select Fiducial Marker Configuration</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1">
-       <widget class="QComboBox" name="fiducialMarkerConfigurationComboBox">
-        <item>
+     <widget class="QWidget" name="page">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>732</width>
+        <height>533</height>
+       </rect>
+      </property>
+      <attribute name="label">
+       <string>Options</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_3">
+         <item>
+          <widget class="QRadioButton" name="fiducialDiameter5mmRadioButton">
+           <property name="text">
+            <string>5mm Fiducial Diameter</string>
+           </property>
+           <property name="checked">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QRadioButton" name="fiducialDiameter3mmRadioButton">
+           <property name="text">
+            <string>3mm Fiducial Diameter</string>
+           </property>
+           <property name="checked">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QCheckBox" name="useNdiTrackerCheckBox">
          <property name="text">
-          <string>10mm Minimal Distance</string>
+          <string>Use NDI-Tracker (if unchecked, Polhemus-Tracker is assumed to be used)</string>
+         </property>
+         <property name="autoExclusive">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <item>
+          <widget class="QLabel" name="selectFiducialMarkerConfigurationLabel">
+           <property name="text">
+            <string>Select Fiducial Marker Configuration</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="fiducialMarkerConfigurationComboBox">
+           <property name="currentIndex">
+            <number>1</number>
+           </property>
+           <item>
+            <property name="text">
+             <string>10mm Minimal Distance</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>15mm Minimal Distance</string>
+            </property>
+           </item>
+           <item>
+            <property name="text">
+             <string>20mm Minimal Distance</string>
+            </property>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
          </property>
-        </item>
-        <item>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="AutomaticRegistration">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>732</width>
+        <height>807</height>
+       </rect>
+      </property>
+      <attribute name="label">
+       <string>Automatic CT Registration</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_6">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_5">
+         <item>
+          <widget class="QLabel" name="selectedFloatingImageLabel">
+           <property name="text">
+            <string>Selected Floating Image:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QmitkDataStorageComboBox" name="floatingImageComboBox"/>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QPushButton" name="localizeFiducialMarkerPushButton">
          <property name="text">
-          <string>15mm Minimal Distance</string>
+          <string>Localize Fiducial Marker</string>
          </property>
-        </item>
-        <item>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="doRegistrationMarkerToImagePushButton">
          <property name="text">
-          <string>20mm Minimal Distance</string>
+          <string>Do Registration Marker CS -&gt; Floating Image CS</string>
          </property>
-        </item>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="2">
-       <widget class="QCheckBox" name="useNdiTrackerCheckBox">
-        <property name="text">
-         <string>Use NDI-Tracker (if unchecked, Polhemus-Tracker is assumed to be used)</string>
-        </property>
-        <property name="autoExclusive">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="classicWayRegisteringCtImageGroupBox">
-     <property name="title">
-      <string>Classic Way Of Registering Floating Image</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_4">
-      <item>
-       <widget class="QLabel" name="selectedFloatingImageLabel">
-        <property name="text">
-         <string>Selected Floating Image:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QmitkDataStorageComboBox" name="floatingImageComboBox"/>
-      </item>
-      <item>
-       <spacer name="verticalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>20</width>
-          <height>40</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item>
-       <widget class="QPushButton" name="localizeFiducialMarkerPushButton">
-        <property name="text">
-         <string>Localize Fiducial Marker</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="doRegistrationMarkerToImagePushButton">
-        <property name="text">
-         <string>Do Registration Marker CS -&gt; Floating Image CS</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="selectedSegmentationsLabel">
-        <property name="text">
-         <string>Selected Segmentation(s):</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QmitkDataStorageComboBox" name="segmentationComboBox"/>
-      </item>
-      <item>
-       <widget class="QLabel" name="selectedSurfaceLabel">
-        <property name="text">
-         <string>Selected Surface:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QmitkDataStorageComboBox" name="selectedSurfaceComboBox"/>
-      </item>
-      <item>
-       <widget class="QPushButton" name="m_AddSurface">
-        <property name="text">
-         <string>Add to addtional surfaces</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="pointSetComboBoxLabel">
-        <property name="text">
-         <string>Selected PointSet:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QmitkDataStorageComboBox" name="pointSetComboBox"/>
-      </item>
-      <item>
-       <widget class="QPushButton" name="visualizeCTtoUSregistrationPushButton">
-        <property name="text">
-         <string>Visualize CT-to-US-registration</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="freezeUnfreezePushButton">
-        <property name="text">
-         <string>Freeze</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="actualizeSegmentationSurfacePSetDataPushButton">
-        <property name="text">
-         <string>Actualize Segmentation + Surface + PointSet Data</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="calculateTREPushButton">
-        <property name="text">
-         <string>Calculate TRE</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="distanceTRELabel">
-        <property name="text">
-         <string>Distance (TRE) between centroid of FloatingImage-target and
+        </widget>
+       </item>
+       <item>
+        <widget class="Line" name="line">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_7">
+         <item>
+          <widget class="QLabel" name="selectedSurfaceLabel">
+           <property name="text">
+            <string>Selected Surface:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QmitkDataStorageComboBox" name="selectedSurfaceComboBox"/>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QPushButton" name="m_AddSurface">
+         <property name="text">
+          <string>Add to addtional surfaces</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="Line" name="line_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="visualizeCTtoUSregistrationPushButton">
+         <property name="text">
+          <string>Visualize CT-to-US-registration</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>596</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="page_3">
+      <attribute name="label">
+       <string>Automatic CT Registration (Additonal Options)</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_6">
+         <item>
+          <widget class="QLabel" name="selectedSegmentationsLabel">
+           <property name="text">
+            <string>Selected Segmentation(s):</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QmitkDataStorageComboBox" name="segmentationComboBox"/>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_8">
+         <item>
+          <widget class="QLabel" name="pointSetComboBoxLabel">
+           <property name="text">
+            <string>Selected PointSet:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QmitkDataStorageComboBox" name="pointSetComboBox"/>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QPushButton" name="freezeUnfreezePushButton">
+         <property name="text">
+          <string>Freeze</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="actualizeSegmentationSurfacePSetDataPushButton">
+         <property name="text">
+          <string>Actualize Segmentation + Surface + PointSet Data</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="calculateTREPushButton">
+         <property name="text">
+          <string>Calculate TRE</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="distanceTRELabel">
+         <property name="text">
+          <string>Distance (TRE) between centroid of FloatingImage-target and
  US-image target (in mm):</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="distanceTREValue">
-        <property name="text">
-         <string>0.000</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groundTruthFiducialLocalizationProtocolGroupBox">
-     <property name="title">
-      <string>Ground-Truth-Fiducial-Localization-Protocol</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="QmitkDataStorageComboBox" name="ctImagesToChooseComboBox"/>
-      </item>
-      <item>
-       <widget class="QLabel" name="chosenCtImagesLabel">
-        <property name="text">
-         <string>Chosen CT images:</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <item>
-         <widget class="QListWidget" name="chosenCtImagesListWidget"/>
-        </item>
-        <item>
-         <layout class="QVBoxLayout" name="verticalLayout_5">
-          <property name="rightMargin">
-           <number>0</number>
-          </property>
-          <item>
-           <widget class="QPushButton" name="addCtImagePushButton">
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="distanceTREValue">
+         <property name="text">
+          <string>0.000</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="calculateCenterPushButton">
+         <property name="text">
+          <string>Calculate Centroid Of Segmentation</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>563</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="page_4">
+      <attribute name="label">
+       <string>Ground Thruth Protocol</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QmitkDataStorageComboBox" name="ctImagesToChooseComboBox"/>
+       </item>
+       <item>
+        <widget class="QLabel" name="chosenCtImagesLabel">
+         <property name="text">
+          <string>Chosen CT images:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QListWidget" name="chosenCtImagesListWidget"/>
+         </item>
+         <item>
+          <layout class="QVBoxLayout" name="verticalLayout_5">
+           <property name="rightMargin">
+            <number>0</number>
+           </property>
+           <item>
+            <widget class="QPushButton" name="addCtImagePushButton">
+             <property name="text">
+              <string>Add</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="removeCtImagePushButton">
+             <property name="text">
+              <string>Remove</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>Select Protocol-Evaluation-Type:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="protocolEvaluationTypeComboBox">
+           <item>
             <property name="text">
-             <string>Add</string>
+             <string>PLANE</string>
             </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="removeCtImagePushButton">
+           </item>
+           <item>
             <property name="text">
-             <string>Remove</string>
+             <string>ANGLE</string>
             </property>
-           </widget>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="label">
-          <property name="text">
-           <string>Select Protocol-Evaluation-Type:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QComboBox" name="protocolEvaluationTypeComboBox">
-          <item>
+           </item>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QPushButton" name="evaluateProtocolPushButton">
+         <property name="text">
+          <string>Evaluate</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <layout class="QFormLayout" name="formLayout_2">
+         <property name="fieldGrowthPolicy">
+          <enum>QFormLayout::ExpandingFieldsGrow</enum>
+         </property>
+         <property name="horizontalSpacing">
+          <number>20</number>
+         </property>
+         <property name="verticalSpacing">
+          <number>10</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <item row="0" column="0">
+          <widget class="QLabel" name="meanFRELabel">
            <property name="text">
-            <string>PLANE</string>
+            <string>Mean FRE (in mm):</string>
            </property>
-          </item>
-          <item>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QLabel" name="meanFREValue">
            <property name="text">
-            <string>ANGLE</string>
+            <string>0</string>
            </property>
-          </item>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class="QPushButton" name="evaluateProtocolPushButton">
-        <property name="text">
-         <string>Evaluate</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QFormLayout" name="formLayout_2">
-        <property name="fieldGrowthPolicy">
-         <enum>QFormLayout::ExpandingFieldsGrow</enum>
-        </property>
-        <property name="horizontalSpacing">
-         <number>20</number>
-        </property>
-        <property name="verticalSpacing">
-         <number>10</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <item row="0" column="0">
-         <widget class="QLabel" name="meanFRELabel">
-          <property name="text">
-           <string>Mean FRE (in mm):</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QLabel" name="meanFREValue">
-          <property name="text">
-           <string>0</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="sdFRELabel">
-          <property name="text">
-           <string>Sd FRE (in mm):</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QLabel" name="sdFREValue">
-          <property name="text">
-           <string>0</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="TRELabel">
-          <property name="text">
-           <string>TRE (in mm):</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QLabel" name="TREValue">
-          <property name="text">
-           <string>0</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QPushButton" name="calculateCenterPushButton">
-     <property name="text">
-      <string>Calculate Centroid Of Segmentation</string>
-     </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="sdFRELabel">
+           <property name="text">
+            <string>Sd FRE (in mm):</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QLabel" name="sdFREValue">
+           <property name="text">
+            <string>0</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="TRELabel">
+           <property name="text">
+            <string>TRE (in mm):</string>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <widget class="QLabel" name="TREValue">
+           <property name="text">
+            <string>0</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_4">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>QmitkDataStorageComboBox</class>
    <extends>QComboBox</extends>
    <header location="global">QmitkDataStorageComboBox.h</header>
   </customwidget>
  </customwidgets>
  <resources>
   <include location="../../../resources/USNavigation.qrc"/>
  </resources>
  <connections/>
 </ui>