diff --git a/Modules/IGTUI/Qmitk/QmitkIGTConnectionWidgetControls.ui b/Modules/IGTUI/Qmitk/QmitkIGTConnectionWidgetControls.ui
index 5e3916f47e..2b2b49fae5 100644
--- a/Modules/IGTUI/Qmitk/QmitkIGTConnectionWidgetControls.ui
+++ b/Modules/IGTUI/Qmitk/QmitkIGTConnectionWidgetControls.ui
@@ -1,318 +1,313 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkIGTConnectionWidgetControls</class>
  <widget class="QWidget" name="QmitkIGTConnectionWidgetControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>443</width>
-    <height>180</height>
+    <height>189</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>QmitkIGTConnection</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_4">
    <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="font">
       <font>
        <pointsize>11</pointsize>
        <weight>50</weight>
        <bold>false</bold>
       </font>
      </property>
      <property name="text">
-      <string>Connect Tracking Device</string>
+      <string>Tracking Device Connection</string>
      </property>
     </widget>
    </item>
    <item row="1" column="0" colspan="2">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QComboBox" name="selectTrackingDeviceComboBox">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="font">
         <font>
          <pointsize>10</pointsize>
         </font>
        </property>
        <property name="currentIndex">
         <number>0</number>
        </property>
        <property name="maxVisibleItems">
         <number>7</number>
        </property>
        <property name="insertPolicy">
         <enum>QComboBox::InsertAtBottom</enum>
        </property>
        <property name="sizeAdjustPolicy">
         <enum>QComboBox::AdjustToContents</enum>
        </property>
        <property name="frame">
         <bool>true</bool>
        </property>
        <item>
         <property name="text">
          <string>NDI Polaris</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>NDI Aurora</string>
         </property>
        </item>
        <item>
         <property name="text">
          <string>Micron Tracker</string>
         </property>
        </item>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="connectButton">
        <property name="enabled">
         <bool>true</bool>
        </property>
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="minimumSize">
         <size>
          <width>0</width>
          <height>50</height>
         </size>
        </property>
        <property name="font">
         <font>
          <pointsize>10</pointsize>
         </font>
        </property>
        <property name="toolTip">
         <string>Connect to camera</string>
        </property>
        <property name="text">
         <string>Connect</string>
        </property>
        <property name="icon">
         <iconset resource="../resources/IGTUI.qrc">
          <normaloff>:/IGTUI/powerRed.png</normaloff>
          <normalon>:/IGTUI/powerGreen.png</normalon>:/IGTUI/powerRed.png</iconset>
        </property>
        <property name="iconSize">
         <size>
          <width>30</width>
          <height>30</height>
         </size>
        </property>
        <property name="checkable">
         <bool>true</bool>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item row="2" column="0" colspan="2">
     <widget class="QStackedWidget" name="deviceConfigurationWidget">
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="page">
       <layout class="QGridLayout" name="gridLayout_3">
        <item row="0" column="0">
         <widget class="QGroupBox" name="groupBox">
          <property name="title">
           <string>NDI Polaris configuration</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_5">
           <item row="0" column="0">
            <widget class="QLabel" name="comPortLabelPolaris">
             <property name="text">
              <string>COM Port:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QSpinBox" name="comPortPolaris">
             <property name="prefix">
              <string>COM </string>
             </property>
            </widget>
           </item>
           <item row="0" column="2">
            <widget class="QLabel" name="portTypeLabelPolaris">
             <property name="text">
              <string>Port type:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="3">
            <widget class="QComboBox" name="portTypePolaris">
             <item>
              <property name="text">
               <string>/dev/ttyUSB</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>/dev/ttyS</string>
              </property>
             </item>
            </widget>
           </item>
           <item row="0" column="4">
            <spacer name="horizontalSpacer_2">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>40</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
           <item row="0" column="5">
            <widget class="QLabel" name="label_4">
             <property name="text">
              <string>Mode:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="6">
            <widget class="QRadioButton" name="polarisMode5D">
             <property name="text">
              <string>5D</string>
             </property>
            </widget>
           </item>
           <item row="0" column="7">
            <widget class="QRadioButton" name="polarisMode6D">
             <property name="text">
              <string>6D</string>
             </property>
             <property name="checked">
              <bool>true</bool>
             </property>
            </widget>
           </item>
          </layout>
-         <zorder>portTypeLabelPolaris</zorder>
-         <zorder>comPortPolaris</zorder>
-         <zorder>portTypePolaris</zorder>
-         <zorder>comPortLabelPolaris</zorder>
-         <zorder>horizontalSpacer_2</zorder>
          <zorder>comPortLabelPolaris</zorder>
          <zorder>comPortPolaris</zorder>
          <zorder>portTypeLabelPolaris</zorder>
          <zorder>portTypePolaris</zorder>
          <zorder>horizontalSpacer_2</zorder>
          <zorder>label_4</zorder>
          <zorder>polarisMode5D</zorder>
          <zorder>polarisMode6D</zorder>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="page_2">
       <layout class="QGridLayout" name="gridLayout_2">
        <item row="0" column="0">
         <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
           <string>NDI Aurora configuration</string>
          </property>
          <layout class="QGridLayout" name="gridLayout">
           <item row="0" column="0">
            <widget class="QLabel" name="comPortLabelAurora">
             <property name="text">
              <string>COM Port:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="1">
            <widget class="QSpinBox" name="comPortAurora">
             <property name="prefix">
              <string>COM </string>
             </property>
            </widget>
           </item>
           <item row="0" column="2">
            <widget class="QLabel" name="portTypeLabelAurora">
             <property name="text">
              <string>Port type:</string>
             </property>
            </widget>
           </item>
           <item row="0" column="3">
            <widget class="QComboBox" name="portTypeAurora">
             <item>
              <property name="text">
               <string>/dev/ttyUSB</string>
              </property>
             </item>
             <item>
              <property name="text">
               <string>/dev/ttyS</string>
              </property>
             </item>
            </widget>
           </item>
           <item row="0" column="4">
            <spacer name="horizontalSpacer">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>213</width>
               <height>20</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
         </widget>
        </item>
       </layout>
      </widget>
      <widget class="QWidget" name="page_3"/>
     </widget>
    </item>
    <item row="3" column="1">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>0</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>
   <include location="../resources/QmitkToFUtilWidget.qrc"/>
   <include location="../resources/IGTUI.qrc"/>
  </resources>
  <connections/>
 </ui>