diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesViewControls.ui b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesViewControls.ui
index fcfbd1028f..551ab7498d 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesViewControls.ui
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesViewControls.ui
@@ -1,810 +1,810 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkControlVisualizationPropertiesViewControls</class>
  <widget class="QWidget" name="QmitkControlVisualizationPropertiesViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>432</width>
     <height>300</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
     <horstretch>0</horstretch>
     <verstretch>100</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>QmitkTemplate</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_4">
    <property name="margin">
     <number>0</number>
    </property>
    <item>
     <widget class="QFrame" name="m_ImageControlsFrame">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <property name="margin">
        <number>0</number>
       </property>
       <item>
        <widget class="QFrame" name="frame_2">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <property name="margin">
           <number>0</number>
          </property>
          <item>
           <widget class="QToolButton" name="m_Reinit">
            <property name="toolTip">
             <string comment="Reinit view" extracomment="Reinit view">Reinit view</string>
            </property>
            <property name="statusTip">
             <string comment="Reinit view" extracomment="Reinit view">Reinit view</string>
            </property>
            <property name="whatsThis">
             <string comment="Reinit view" extracomment="Reinit view">Reinit view</string>
            </property>
            <property name="text">
             <string/>
            </property>
            <property name="checkable">
             <bool>true</bool>
            </property>
            <property name="checked">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QToolButton" name="m_TextureIntON">
            <property name="toolTip">
             <string comment="Texture interpolation ON" extracomment="Texture interpolation ON">Texture interpolation ON</string>
            </property>
            <property name="statusTip">
             <string comment="Texture interpolation ON" extracomment="Texture interpolation ON">Texture interpolation ON</string>
            </property>
            <property name="whatsThis">
             <string comment="Texture interpolation ON" extracomment="Texture interpolation ON">Texture interpolation ON</string>
            </property>
            <property name="text">
             <string/>
            </property>
            <property name="checkable">
             <bool>true</bool>
            </property>
            <property name="checked">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QToolButton" name="m_VisibleOdfsON_T">
            <property name="toolTip">
             <string comment="Toggle visibility of ODF glyphs" extracomment="Toggle visibility of ODF glyphs">Toggle visibility of ODF glyphs</string>
            </property>
            <property name="statusTip">
             <string comment="Toggle visibility of ODF glyphs" extracomment="Toggle visibility of ODF glyphs">Toggle visibility of ODF glyphs</string>
            </property>
            <property name="whatsThis">
             <string comment="Toggle visibility of ODF glyphs" extracomment="Toggle visibility of ODF glyphs">Toggle visibility of ODF glyphs</string>
            </property>
            <property name="text">
             <string/>
            </property>
            <property name="checkable">
             <bool>true</bool>
            </property>
            <property name="checked">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QToolButton" name="m_VisibleOdfsON_S">
            <property name="toolTip">
             <string comment="Toggle visibility of ODF glyphs" extracomment="Toggle visibility of ODF glyphs">Toggle visibility of ODF glyphs</string>
            </property>
            <property name="statusTip">
             <string comment="Toggle visibility of ODF glyphs" extracomment="Toggle visibility of ODF glyphs">Toggle visibility of ODF glyphs</string>
            </property>
            <property name="whatsThis">
             <string comment="Toggle visibility of ODF glyphs" extracomment="Toggle visibility of ODF glyphs">Toggle visibility of ODF glyphs</string>
            </property>
            <property name="text">
             <string/>
            </property>
            <property name="checkable">
             <bool>true</bool>
            </property>
            <property name="checked">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QToolButton" name="m_VisibleOdfsON_C">
            <property name="toolTip">
             <string comment="Toggle visibility of ODF glyphs" extracomment="Toggle visibility of ODF glyphs">Toggle visibility of ODF glyphs</string>
            </property>
            <property name="statusTip">
             <string comment="Toggle visibility of ODF glyphs" extracomment="Toggle visibility of ODF glyphs">Toggle visibility of ODF glyphs</string>
            </property>
            <property name="whatsThis">
             <string comment="Toggle visibility of ODF glyphs" extracomment="Toggle visibility of ODF glyphs">Toggle visibility of ODF glyphs</string>
            </property>
            <property name="text">
             <string/>
            </property>
            <property name="checkable">
             <bool>true</bool>
            </property>
            <property name="checked">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QToolButton" name="m_TSMenu">
            <property name="toolTip">
             <string comment="Toggle visibility of ODF glyphs" extracomment="Toggle visibility of ODF glyphs">Multislice Projection</string>
            </property>
            <property name="statusTip">
             <string comment="Toggle visibility of ODF glyphs" extracomment="Toggle visibility of ODF glyphs">Multislice Projection</string>
            </property>
            <property name="whatsThis">
             <string comment="Toggle visibility of ODF glyphs" extracomment="Toggle visibility of ODF glyphs">Multislice Projection</string>
            </property>
            <property name="text">
             <string>MIP</string>
            </property>
            <property name="popupMode">
             <enum>QToolButton::MenuButtonPopup</enum>
            </property>
            <property name="arrowType">
             <enum>Qt::NoArrow</enum>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLabel" name="label_channel">
            <property name="text">
             <string>Channel</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QSlider" name="m_DisplayIndex">
            <property name="maximum">
             <number>300</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QFrame" name="m_NumberGlyphsFrame">
            <property name="frameShape">
             <enum>QFrame::NoFrame</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Plain</enum>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout_6">
             <property name="margin">
              <number>0</number>
             </property>
             <item>
              <spacer name="horizontalSpacer">
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
               <property name="sizeHint" stdset="0">
                <size>
                 <width>20</width>
                 <height>20</height>
                </size>
               </property>
              </spacer>
             </item>
             <item>
              <widget class="QLabel" name="label_glyphs">
               <property name="text">
                <string>#Glyphs</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QSpinBox" name="m_ShowMaxNumber">
               <property name="maximum">
                <number>9999</number>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item>
        <widget class="QFrame" name="OpacMinFrame">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Plain</enum>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <property name="margin">
           <number>0</number>
          </property>
          <item>
           <widget class="QLabel" name="label_4">
            <property name="text">
             <string>Opacity</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QmitkFloatingPointSpanSlider" name="m_OpacitySlider">
            <property name="maximum">
             <number>100</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLabel" name="m_OpacityMinFaLabel">
            <property name="minimumSize">
             <size>
              <width>80</width>
              <height>0</height>
             </size>
            </property>
            <property name="text">
             <string>0.0 : 0.0</string>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item>
        <widget class="QFrame" name="frame">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <property name="spacing">
           <number>0</number>
          </property>
          <property name="margin">
           <number>0</number>
          </property>
          <item>
           <widget class="QFrame" name="m_NormalizationScalingFrame">
            <property name="frameShape">
             <enum>QFrame::NoFrame</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
            </property>
            <layout class="QGridLayout" name="gridLayout">
             <property name="margin">
              <number>0</number>
             </property>
             <property name="spacing">
              <number>0</number>
             </property>
             <item row="1" column="1">
              <widget class="QFrame" name="m_ScalingFrame">
               <property name="frameShape">
                <enum>QFrame::NoFrame</enum>
               </property>
               <property name="frameShadow">
                <enum>QFrame::Plain</enum>
               </property>
               <layout class="QHBoxLayout" name="horizontalLayout_3">
                <property name="margin">
                 <number>0</number>
                </property>
                <item>
                 <widget class="QComboBox" name="m_AdditionalScaling">
                  <property name="frame">
                   <bool>false</bool>
                  </property>
                  <item>
                   <property name="text">
                    <string>None</string>
                   </property>
                  </item>
                  <item>
                   <property name="text">
                    <string>By GFA</string>
                   </property>
                  </item>
                  <item>
                   <property name="text">
                    <string>By ASR</string>
                   </property>
                  </item>
                 </widget>
                </item>
                <item>
                 <widget class="QLabel" name="label">
                  <property name="text">
                   <string>*</string>
                  </property>
                 </widget>
                </item>
                <item>
                 <widget class="QDoubleSpinBox" name="m_ScalingFactor"/>
                </item>
               </layout>
              </widget>
             </item>
             <item row="0" column="1">
              <widget class="QCheckBox" name="m_ScalingCheckbox">
               <property name="text">
                <string>Scaling</string>
               </property>
              </widget>
             </item>
             <item row="1" column="0">
              <widget class="QFrame" name="m_NormalizationFrame">
               <property name="frameShape">
                <enum>QFrame::NoFrame</enum>
               </property>
               <property name="frameShadow">
                <enum>QFrame::Plain</enum>
               </property>
               <layout class="QHBoxLayout" name="horizontalLayout_5">
                <property name="spacing">
                 <number>0</number>
                </property>
                <property name="margin">
                 <number>0</number>
                </property>
               </layout>
              </widget>
             </item>
             <item row="0" column="0">
              <widget class="QComboBox" name="m_NormalizationDropdown">
               <property name="frame">
                <bool>false</bool>
               </property>
               <item>
                <property name="text">
                 <string>Min-Max</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>Max</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>None</string>
                </property>
               </item>
               <item>
                <property name="text">
                 <string>Global-Max</string>
                </property>
               </item>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
          <item>
           <widget class="QFrame" name="params_frame">
            <property name="frameShape">
             <enum>QFrame::NoFrame</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout">
             <property name="margin">
              <number>0</number>
             </property>
             <item>
              <widget class="QLabel" name="label_2">
               <property name="text">
                <string>Param1</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QDoubleSpinBox" name="m_IndexParam1">
               <property name="maximum">
                <double>9999.989999999999782</double>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QLabel" name="label_3">
               <property name="text">
                <string>Param2</string>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QDoubleSpinBox" name="m_IndexParam2">
               <property name="maximum">
                <double>9999.989999999999782</double>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QFrame" name="m_BundleControlsFrame">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <property name="margin">
        <number>0</number>
       </property>
       <item>
        <widget class="QFrame" name="frame_5">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_11">
          <property name="margin">
           <number>0</number>
          </property>
          <item>
           <widget class="QToolButton" name="m_Color">
            <property name="toolTip">
             <string>Uniform Color for Bundle</string>
            </property>
            <property name="text">
             <string/>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QToolButton" name="m_Crosshair">
            <property name="toolTip">
             <string>Position Crosshair by 3D-Click</string>
            </property>
            <property name="statusTip">
             <string/>
            </property>
            <property name="text">
             <string/>
            </property>
            <property name="checkable">
             <bool>true</bool>
            </property>
            <property name="checked">
             <bool>false</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QToolButton" name="m_2DHeatmap">
            <property name="toolTip">
             <string>Generate 2D-Image as Heatmap</string>
            </property>
            <property name="whatsThis">
             <string/>
            </property>
            <property name="text">
             <string/>
            </property>
           </widget>
          </item>
          <item>
           <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>
         </layout>
        </widget>
       </item>
       <item>
        <widget class="QFrame" name="frame_4">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
-        <layout class="QHBoxLayout" name="horizontalLayout_10">
+        <layout class="QVBoxLayout" name="verticalLayout_5">
          <property name="spacing">
           <number>0</number>
          </property>
          <property name="margin">
           <number>0</number>
          </property>
          <item>
-          <widget class="QFrame" name="frame_wire">
+          <widget class="QFrame" name="frame_tube">
            <property name="frameShape">
             <enum>QFrame::NoFrame</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
            </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_8">
+           <layout class="QHBoxLayout" name="horizontalLayout_9">
             <property name="margin">
              <number>0</number>
             </property>
             <item>
-             <widget class="QPushButton" name="m_Wire">
+             <widget class="QPushButton" name="m_Tube">
               <property name="maximumSize">
                <size>
                 <width>50</width>
                 <height>16777215</height>
                </size>
               </property>
               <property name="text">
-               <string>Wire</string>
+               <string>Tube</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QSlider" name="m_LineWidth">
-              <property name="minimum">
-               <number>1</number>
-              </property>
-              <property name="maximum">
-               <number>9</number>
-              </property>
+             <widget class="QSlider" name="m_TubeRadius">
               <property name="value">
-               <number>1</number>
+               <number>15</number>
               </property>
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QLabel" name="label_linewidth">
+             <widget class="QLabel" name="label_tuberadius">
               <property name="minimumSize">
                <size>
-                <width>65</width>
+                <width>90</width>
                 <height>0</height>
                </size>
               </property>
               <property name="maximumSize">
                <size>
-                <width>43</width>
+                <width>10000</width>
                 <height>16777215</height>
                </size>
               </property>
               <property name="text">
-               <string>Width</string>
+               <string>Radius</string>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
          <item>
-          <widget class="QFrame" name="frame_tube">
+          <widget class="QFrame" name="frame_wire">
            <property name="frameShape">
             <enum>QFrame::NoFrame</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
            </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_9">
+           <layout class="QHBoxLayout" name="horizontalLayout_8">
             <property name="margin">
              <number>0</number>
             </property>
             <item>
-             <widget class="QPushButton" name="m_Tube">
+             <widget class="QPushButton" name="m_Wire">
               <property name="maximumSize">
                <size>
                 <width>50</width>
                 <height>16777215</height>
                </size>
               </property>
               <property name="text">
-               <string>Tube</string>
+               <string>Wire</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QSlider" name="m_TubeRadius">
+             <widget class="QSlider" name="m_LineWidth">
+              <property name="minimum">
+               <number>1</number>
+              </property>
+              <property name="maximum">
+               <number>9</number>
+              </property>
               <property name="value">
-               <number>15</number>
+               <number>1</number>
               </property>
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QLabel" name="label_tuberadius">
+             <widget class="QLabel" name="label_linewidth">
               <property name="minimumSize">
                <size>
                 <width>90</width>
                 <height>0</height>
                </size>
               </property>
               <property name="maximumSize">
                <size>
-                <width>10000</width>
+                <width>43</width>
                 <height>16777215</height>
                </size>
               </property>
               <property name="text">
-               <string>Radius</string>
+               <string>Width</string>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QFrame" name="m_PlanarFigureControlsFrame">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_7">
       <property name="margin">
        <number>0</number>
       </property>
       <item>
        <widget class="QToolButton" name="m_Focus">
         <property name="toolTip">
          <string>Focus Planar Figure</string>
         </property>
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QToolButton" name="m_PFColor">
         <property name="minimumSize">
          <size>
           <width>0</width>
           <height>0</height>
          </size>
         </property>
         <property name="toolTip">
          <string>Change Color in 2D-View</string>
         </property>
         <property name="text">
          <string>2D</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QToolButton" name="m_PFColor3D">
         <property name="toolTip">
          <string>Change Color in 3D-View</string>
         </property>
         <property name="text">
          <string>3D</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QSlider" name="m_PFWidth">
         <property name="value">
          <number>20</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QLabel" name="label_pfwidth">
         <property name="minimumSize">
          <size>
           <width>80</width>
           <height>0</height>
          </size>
         </property>
         <property name="text">
          <string>Width</string>
         </property>
         <property name="alignment">
          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
         </property>
        </widget>
       </item>
      </layout>
     </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>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>QmitkFloatingPointSpanSlider</class>
    <extends>QSlider</extends>
    <header>QmitkFloatingPointSpanSlider.h</header>
   </customwidget>
  </customwidgets>
  <includes>
   <include location="local">QmitkDataStorageComboBox.h</include>
  </includes>
  <resources/>
  <connections/>
 </ui>
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/files.cmake b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/files.cmake
index 9a69bc2ada..23957c69ab 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/files.cmake
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/files.cmake
@@ -1,62 +1,62 @@
 SET(SRC_CPP_FILES
   QmitkDiffusionImagingAppApplication.cpp
   QmitkDiffusionImagingAppWorkbenchAdvisor.cpp
 )
 
 SET(INTERNAL_CPP_FILES
   QmitkDiffusionImagingAppApplicationPlugin.cpp
   QmitkDiffusionImagingAppIntroPart.cpp
   QmitkDiffusionImagingAppPerspective.cpp
   QmitkWelcomePerspective.cpp
 )
 
 SET(UI_FILES
  src/internal/QmitkWelcomeScreenViewControls.ui
 )
 
 SET(MOC_H_FILES
   src/internal/QmitkDiffusionImagingAppIntroPart.h
   src/internal/QmitkDiffusionImagingAppApplicationPlugin.h
   src/QmitkDiffusionImagingAppApplication.h
   src/internal/QmitkDiffusionImagingAppPerspective.h
   src/internal/QmitkWelcomePerspective.h
 )
 
 SET(CACHED_RESOURCE_FILES
 # list of resource files which can be used by the plug-in
 # system without loading the plug-ins shared library,
 # for example the icon used in the menu and tabs for the
 # plug-in views in the workbench
   plugin.xml
-  resources/mintLogo.png
+  resources/diffusionimaging.png
 )
 
 SET(QRC_FILES
 # uncomment the following line if you want to use Qt resources
   resources/welcome/QmitkWelcomeScreenView.qrc
   resources/org_mitk_gui_qt_diffusionimagingapp.qrc
 )
 
 # SET(CPP_FILES)
 
 foreach(file ${SRC_CPP_FILES})
   SET(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   SET(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
 
 
 #----------- Qt Help Collection Project -------------#
 
 IF (BLUEBERRY_USE_QT_HELP)
   SET(_plugin_qhcp_input "${CMAKE_CURRENT_SOURCE_DIR}/documentation/MitkDiffusionImagingAppQtHelpCollectionProject.qhcp")
   SET(_plugin_qhcp_output "${PLUGIN_OUTPUT_DIR}/resources/MitkDiffusionImagingAppQtHelpCollection_${MBI_WC_REVISION_HASH}.qhc")
   ADD_CUSTOM_COMMAND(OUTPUT ${_plugin_qhcp_output}
                      COMMAND ${QT_COLLECTIONGENERATOR_EXECUTABLE} ${_plugin_qhcp_input} -o ${_plugin_qhcp_output}
                      DEPENDS ${_plugin_qhcp_input}
                      )
 
   SET(FILE_DEPENDENCIES ${_plugin_qhcp_output})
 ENDIF()
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/plugin.xml b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/plugin.xml
index 82eb16711a..b2210518fc 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/plugin.xml
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/plugin.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?BlueBerry version="0.1"?>
 <plugin>
   <extension point="org.blueberry.osgi.applications">
     <application id="org.mitk.qt.diffusionimagingapp">
       <run class="QmitkDiffusionImagingAppApplication"/>
     </application>
   </extension>
   
   <extension point="org.blueberry.ui.intro">
     <intro id="org.mitk.qt.diffusionimagingappintro"
       class="QmitkDiffusionImagingAppIntroPart"
       role="editor"/>
     <introProductBinding
       productId=""
       introId="org.mitk.qt.diffusionimagingappintro"/>
   </extension>
   
   <extension point="org.blueberry.ui.perspectives">
-    <perspective id="org.mitk.diffusionimagingapp.perspectives.diffusionimagingapp" name="Diffusion Imaging" class="QmitkDiffusionImagingAppPerspective" icon="resources/diffusionimaging.png"/>
+    <perspective id="org.mitk.diffusionimagingapp.perspectives.diffusionimagingapp" name="Springer DTI Atlas" class="QmitkDiffusionImagingAppPerspective" icon="resources/diffusionimaging.png"/>
     <perspective id="org.mitk.diffusionimagingapp.perspectives.welcome" name="Welcome" class="QmitkWelcomePerspective" icon="resources/icon_home.png"/>
   </extension>
   
 </plugin>
 
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/diffusionimaging.png b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/diffusionimaging.png
index dd5215d698..d875ea96bd 100644
Binary files a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/diffusionimaging.png and b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/resources/diffusionimaging.png differ
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.cpp b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.cpp
index 2955830b9c..42fdd0d654 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimagingapp/src/QmitkDiffusionImagingAppWorkbenchAdvisor.cpp
@@ -1,110 +1,111 @@
 /*=========================================================================
  
  Program:   BlueBerry Platform
  Language:  C++
  Date:      $Date: 2009-10-23 02:59:36 +0200 (Fri, 23 Oct 2009) $
  Version:   $Revision$
  
  Copyright (c) German Cancer Research Center, Division of Medical and
  Biological Informatics. All rights reserved.
  See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
  
  This software is distributed WITHOUT ANY WARRANTY; without even
  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  PURPOSE.  See the above copyright notices for more information.
  
  =========================================================================*/
 
 #include "QmitkDiffusionImagingAppWorkbenchAdvisor.h"
 
 #include "internal/QmitkDiffusionImagingAppApplicationPlugin.h"
 
 #include <berryPlatform.h>
 #include <berryIPreferencesService.h>
 #include <berryWorkbenchPreferenceConstants.h>
 #include <berryQtAssistantUtil.h>
 #include <QmitkExtWorkbenchWindowAdvisor.h>
 
 #include <QApplication>
 
 const std::string QmitkDiffusionImagingAppWorkbenchAdvisor::WELCOME_PERSPECTIVE_ID = "org.mitk.diffusionimagingapp.perspectives.welcome";
 
 
 void
 QmitkDiffusionImagingAppWorkbenchAdvisor::Initialize(berry::IWorkbenchConfigurer::Pointer configurer)
 {
   berry::QtWorkbenchAdvisor::Initialize(configurer);
 
   configurer->SetSaveAndRestore(true);
 
   // TODO This should go into the products plugin_customization.ini file (when
   // the product and branding support is finished, see bug 2146).
   // This will not work anymore, if bug 2822 is fixed.
   berry::IPreferencesService::Pointer prefService = berry::Platform::GetServiceRegistry().GetServiceById<berry::IPreferencesService>(berry::IPreferencesService::ID);
   prefService->GetSystemPreferences()->Put(berry::WorkbenchPreferenceConstants::PREFERRED_SASH_LAYOUT, berry::WorkbenchPreferenceConstants::RIGHT);
 
   QString collectionFile = QmitkDiffusionImagingAppApplicationPlugin::GetDefault()->GetQtHelpCollectionFile();
   if (!collectionFile.isEmpty())
   {
 //    berry::QtAssistantUtil::SetHelpCollectionFile(collectionFile);
 //    berry::QtAssistantUtil::SetDefaultHelpUrl("qthelp://org.mitk.gui.qt.diffusionimagingapp/bundle/index.html");
 
     typedef std::vector<berry::IBundle::Pointer> BundleContainer;
     BundleContainer bundles = berry::Platform::GetBundles();
     berry::QtAssistantUtil::RegisterQCHFiles(bundles);
   }
 
 }
 
 berry::WorkbenchWindowAdvisor*
 QmitkDiffusionImagingAppWorkbenchAdvisor::CreateWorkbenchWindowAdvisor(
         berry::IWorkbenchWindowConfigurer::Pointer configurer)
 {
   std::vector<std::string> perspExcludeList;
   perspExcludeList.push_back( std::string("org.mitk.diffusionimagingapp.perspectives.welcome") );
   perspExcludeList.push_back( std::string("org.mitk.perspectives.diffusionimaginginternal") );
   perspExcludeList.push_back( std::string("org.mitk.perspectives.publicdiffusionimaging") );
   perspExcludeList.push_back( std::string("org.mitk.extapp.defaultperspective") );
   perspExcludeList.push_back( std::string("org.mitk.coreapp.defaultperspective") );
 
   std::vector<std::string> viewExcludeList;
   viewExcludeList.push_back( std::string("org.mitk.views.partialvolumeanalysis") );
   viewExcludeList.push_back( std::string("org.mitk.views.globalfibertracking") );
   viewExcludeList.push_back( std::string("org.mitk.views.tractbasedspatialstatistics") );
   viewExcludeList.push_back( std::string("org.mitk.views.fibertracking") );
   viewExcludeList.push_back( std::string("org.mitk.views.ivim") );
   viewExcludeList.push_back( std::string("org.mitk.views.qballreconstruction") );
   viewExcludeList.push_back( std::string("org.mitk.views.diffusiondicomimport") );
   viewExcludeList.push_back( std::string("org.mitk.views.diffusionpreprocessing") );
   viewExcludeList.push_back( std::string("org.mitk.views.diffusionquantification") );
   viewExcludeList.push_back( std::string("org.mitk.views.tensorreconstruction") );
   viewExcludeList.push_back( std::string("org.mitk.views.perspectiveswitcher") );
   viewExcludeList.push_back( std::string("org.mitk.views.basicimageprocessing") );
   viewExcludeList.push_back( std::string("org.mitk.views.fiberbundleoperations") );
   viewExcludeList.push_back( std::string("org.mitk.views.measurement") );
   viewExcludeList.push_back( std::string("org.mitk.views.moviemaker") );
   viewExcludeList.push_back( std::string("org.mitk.views.odfdetails") );
   viewExcludeList.push_back( std::string("org.mitk.views.propertylistview") );
   viewExcludeList.push_back( std::string("org.mitk.views.screenshotmaker") );
   viewExcludeList.push_back( std::string("org.mitk.views.segmentation") );
   viewExcludeList.push_back( std::string("org.mitk.views.imagestatistics") );
-  viewExcludeList.push_back( std::string("org.mitk.views.controlvisualizationpropertiesview") );
+//  viewExcludeList.push_back( std::string("org.mitk.views.controlvisualizationpropertiesview") );
   viewExcludeList.push_back( std::string("org.mitk.views.volumevisualization") );
+  viewExcludeList.push_back( std::string("org.mitk.views.simplemeasurement") );
 
   configurer->SetShowPerspectiveBar(false);
   configurer->SetInitialSize(berry::Point(1000,770));
 
   QmitkExtWorkbenchWindowAdvisor* advisor = new QmitkExtWorkbenchWindowAdvisor(this, configurer);
   advisor->SetPerspectiveExcludeList(perspExcludeList);
   advisor->SetViewExcludeList(viewExcludeList);
   advisor->ShowViewToolbar(false);
   advisor->ShowVersionInfo(false);
   advisor->SetProductName("MITK Diffusioin Imaging App");
   advisor->SetWindowIcon(":/org.mitk.gui.qt.diffusionimagingapp/app-icon.png");
   return advisor;
 }
 
 std::string QmitkDiffusionImagingAppWorkbenchAdvisor::GetInitialWindowPerspectiveId()
 {
   return WELCOME_PERSPECTIVE_ID;
 }