diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberProcessingViewUserManual.dox b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberProcessingViewUserManual.dox
new file mode 100644
index 0000000000..963ed94489
--- /dev/null
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkFiberProcessingViewUserManual.dox
@@ -0,0 +1,25 @@
+/**
+\bundlemainpage{org_fiberprocessing} Fiber Processing View
+
+This view provides everything needed to process fiber bundles.
+
+Available sections:
+  - \ref QmitkDiffusionImagingUserManualFiberManpulation
+  - \ref QmitkDiffusionImagingUserManualFiberProcessing
+
+\image html fiberbundleoperationsview.png The Fiber Processing View
+
+\section QmitkDiffusionImagingUserManualFiberManpulation Fiber Bundle Manipulation
+
+Fiber extraction:
+Place ROIs in the 2D render widgets (cricles or polygons) and extract fibers from the bundle that pass through these ROIs by selecting the according ROI and fiber bundle in the datamanger and starting the extraction. The ROIs can be combined via logical operations. All fibers that pass through the thus generated composite ROI are extracted.
+
+\section QmitkDiffusionImagingUserManualFiberProcessing Generation of additional information from fiber bundles
+
+\li Tract density image: generate a 2D heatmap from a fiber bundle
+\li Binary envelope: generate a binary image from a fiber bundle
+\li Fiber bundle image: generate a 2D rgba image representation of the fiber bundle
+\li Fiber endings image: generate a 2D binary image showing the locations of fiber endpoints
+\li Fiber endings pointset: generate a poinset containing the locations of fiber endpoints
+
+*/
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkGibbsTrackingViewUserManual.dox b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkGibbsTrackingViewUserManual.dox
new file mode 100644
index 0000000000..247a462d9a
--- /dev/null
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkGibbsTrackingViewUserManual.dox
@@ -0,0 +1,40 @@
+/**
+\bundlemainpage{org_gibbstracking} Gibbs Tracking View
+
+This view provides the user interface for the Gibbs Tracking algorithm, a global fiber tracking algorithm, originally proposed by Reisert et.al. [1].
+
+Available sections:
+  - \ref QmitkDiffusionImagingUserManualInputData
+  - \ref QmitkDiffusionImagingUserManualParameters
+  - \ref QmitkDiffusionImagingUserManualTrackingSurveillance
+  - \ref QmitkDiffusionImagingUserManualReferences
+
+\image html gibbstrackingview.png The Gibbs Tracking View
+
+\section QmitkDiffusionImagingUserManualInputData Input Data
+
+Mandatory Input:
+\li One Q-Ball image selected in the datamanager
+
+Optional Input:
+\li Mask Image: Float image used as probability mask for the generation of fiber segments. Usually used as binary brain mask to reduce the searchspace of the algorithm and to avoid fibers resulting from noise outside of the brain.
+\li GFA Image: Float image used to automatically determine the "particle weight" parameter.
+
+\section QmitkDiffusionImagingUserManualParameters Q-Ball Reconstruction
+
+\li Number of iterations: More iterations causes the algorithm to be more stable but also to take longer to finish the tracking. Rcommended: 10⁷-10⁹ iterations.
+\li Particle length/width/weight controlling the contribution of each particle to the model M
+\li Start and end temperature controlling how fast the process reaches a stable state. (usually no change needed)
+\li Weighting between the internal (affinity of the model to long and straigt fibers) and external energy (affinity of the model towards the data). (usually no change needed).
+\li Minimum fiber length constraint. Fibers containing less segments are discarded after the tracking. (usually no change needed)
+
+\section QmitkDiffusionImagingUserManualTrackingSurveillance Surveilance of the tracking process
+
+Once started, the tracking can be monitored via the textual output that informs about the tracking progress and several stats of the current state of the algorithm. If enabled, the intermediate tracking results are displayed in the renderwindows each second. This live visualization should usually be disabled for performance reasons. It can be turned on and off during the tracking process via the according checkbox.
+
+\section QmitkDiffusionImagingUserManualReferences References
+
+[1] Reisert, M., Mader, I., Anastasopoulos, C., Weigel, M., Schnell, S., Kiselev, V.: Global fiber reconstruction becomes practical. Neuroimage 54 (2011) 955-962
+
+
+*/
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkOdfDetailsViewUserManual.dox b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkOdfDetailsViewUserManual.dox
new file mode 100644
index 0000000000..f7caec3ddd
--- /dev/null
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/QmitkOdfDetailsViewUserManual.dox
@@ -0,0 +1,11 @@
+/**
+\bundlemainpage{org_odfdetails} ODF Details View
+
+This view provides detailed information about the orentation distribution function at the current crosshair position (if a Q-Ball image is selected). A visualization of the ODF as well as the ODF values and according statistical information are displayed.
+
+\image html odfdetailsview.png The Gibbs Tracking View
+
+\section QmitkDiffusionImagingUserManualInputData Issues
+At the moment this view can opnly process Q-Ball images but not tensor images. Also the normalization properties etc. of the image as well as the correct rotation of the ODF are currently not incorporated into the views visualization.
+
+*/
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/fiberprocessing.png b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/fiberprocessing.png
new file mode 100644
index 0000000000..595de7ff23
Binary files /dev/null and b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/fiberprocessing.png differ
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/gibbstrackingview.png b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/gibbstrackingview.png
new file mode 100644
index 0000000000..3e20911bed
Binary files /dev/null and b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/gibbstrackingview.png differ
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/odfdetails.png b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/odfdetails.png
new file mode 100644
index 0000000000..59ac0b25f6
Binary files /dev/null and b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/documentation/UserManual/odfdetails.png differ
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingViewControls.ui b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingViewControls.ui
index 09310af2be..ae5717430c 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingViewControls.ui
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingViewControls.ui
@@ -1,535 +1,544 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkFiberProcessingViewControls</class>
  <widget class="QWidget" name="QmitkFiberProcessingViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>665</width>
     <height>587</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="margin">
+   <property name="leftMargin">
+    <number>5</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>5</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <widget class="QFrame" name="m_PlanarFigureButtonsFrame">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
        <width>200</width>
        <height>50</height>
       </size>
      </property>
      <property name="maximumSize">
       <size>
        <width>300</width>
        <height>60</height>
       </size>
      </property>
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout_5">
       <property name="spacing">
        <number>12</number>
       </property>
       <property name="margin">
        <number>0</number>
       </property>
       <item>
        <widget class="QPushButton" name="m_CircleButton">
         <property name="maximumSize">
          <size>
           <width>30</width>
           <height>30</height>
          </size>
         </property>
         <property name="toolTip">
          <string comment="Draw circular ROI" extracomment="Draw circular ROI">Draw circular ROI</string>
         </property>
         <property name="text">
          <string/>
         </property>
         <property name="icon">
          <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
           <normaloff>:/QmitkDiffusionImaging/circle.png</normaloff>:/QmitkDiffusionImaging/circle.png</iconset>
         </property>
         <property name="iconSize">
          <size>
           <width>32</width>
           <height>32</height>
          </size>
         </property>
         <property name="checkable">
          <bool>false</bool>
         </property>
         <property name="flat">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QPushButton" name="m_RectangleButton">
         <property name="maximumSize">
          <size>
           <width>30</width>
           <height>30</height>
          </size>
         </property>
         <property name="toolTip">
          <string comment="Draw rectangular ROI" extracomment="Draw rectangular ROI">Draw rectangular ROI</string>
         </property>
         <property name="text">
          <string/>
         </property>
         <property name="icon">
          <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
           <normaloff>:/QmitkDiffusionImaging/rectangle.png</normaloff>:/QmitkDiffusionImaging/rectangle.png</iconset>
         </property>
         <property name="iconSize">
          <size>
           <width>32</width>
           <height>32</height>
          </size>
         </property>
         <property name="checkable">
          <bool>true</bool>
         </property>
         <property name="flat">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QPushButton" name="m_PolygonButton">
         <property name="maximumSize">
          <size>
           <width>30</width>
           <height>30</height>
          </size>
         </property>
         <property name="toolTip">
          <string comment="Draw polygonal ROI" extracomment="Draw polygonal ROI">Draw polygonal ROI</string>
         </property>
         <property name="text">
          <string/>
         </property>
         <property name="icon">
          <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
           <normaloff>:/QmitkDiffusionImaging/polygon.png</normaloff>:/QmitkDiffusionImaging/polygon.png</iconset>
         </property>
         <property name="iconSize">
          <size>
           <width>32</width>
           <height>32</height>
          </size>
         </property>
         <property name="checkable">
          <bool>true</bool>
         </property>
         <property name="flat">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
        <spacer name="horizontalSpacer">
         <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">
      <property name="maximumSize">
       <size>
        <width>16777215</width>
        <height>16777215</height>
       </size>
      </property>
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QHBoxLayout" name="horizontalLayout">
       <property name="spacing">
        <number>0</number>
       </property>
       <property name="margin">
        <number>0</number>
       </property>
       <item>
        <widget class="QCommandLinkButton" name="PFCompoANDButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="maximumSize">
          <size>
           <width>60</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="toolTip">
          <string comment="Create AND composition with selected ROIs" extracomment="Create AND composition with selected ROIs">Create AND composition with selected ROIs</string>
         </property>
         <property name="text">
          <string>AND</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCommandLinkButton" name="PFCompoORButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="maximumSize">
          <size>
           <width>60</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="toolTip">
          <string comment="Create OR composition with selected ROIs" extracomment="Create OR composition with selected ROIs">Create OR composition with selected ROIs</string>
         </property>
         <property name="text">
          <string>OR</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QCommandLinkButton" name="PFCompoNOTButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="maximumSize">
          <size>
           <width>60</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="toolTip">
          <string comment="Create NOT composition from selected ROI" extracomment="Create NOT composition from selected ROI">Create NOT composition from selected ROI</string>
         </property>
         <property name="text">
          <string>NOT</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QFrame" name="frame_2">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
       <property name="margin">
        <number>0</number>
       </property>
       <item row="0" column="0">
        <widget class="QCommandLinkButton" name="doExtractFibersButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="maximumSize">
          <size>
           <width>200</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="font">
          <font>
           <pointsize>11</pointsize>
          </font>
         </property>
         <property name="toolTip">
          <string comment="Extract fibers passing through selected ROI or composite ROI" extracomment="Extract fibers passing through selected ROI or composite ROI">Extract fibers passing through selected ROI or composite ROI</string>
         </property>
         <property name="text">
          <string>Extract from ROIs</string>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
        <widget class="QCommandLinkButton" name="m_JoinBundles">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="maximumSize">
          <size>
           <width>200</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="font">
          <font>
           <pointsize>11</pointsize>
          </font>
         </property>
         <property name="toolTip">
          <string comment="Merge two fiber bundles" extracomment="Merge two fiber bundles">Merge two fiber bundles</string>
         </property>
         <property name="text">
          <string>Join Bundles</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QCommandLinkButton" name="m_GenerateROIImage">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="maximumSize">
          <size>
           <width>300</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="font">
          <font>
           <pointsize>11</pointsize>
          </font>
         </property>
         <property name="toolTip">
          <string comment="Generate a binary image containing all selected ROIs" extracomment="Generate a binary image containing all selected ROIs">Generate a binary image containing all selected ROIs</string>
         </property>
         <property name="text">
          <string>Generate ROI Image</string>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="QCommandLinkButton" name="m_SubstractBundles">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="maximumSize">
          <size>
           <width>200</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="font">
          <font>
           <pointsize>11</pointsize>
          </font>
         </property>
         <property name="toolTip">
          <string comment="Returns fiber bundle containing all fibers the two selected bundles dont't have in common" extracomment="Returns fiber bundle containing all fibers the two selected bundles dont't have in common">Returns fiber bundle containing all fibers the two selected bundles dont't have in common</string>
         </property>
         <property name="text">
          <string>Substract Bundles</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QFrame" name="frame_3">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Fibers in Selected Bundle:</string>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLabel" name="m_NumFibersLabel">
         <property name="text">
          <string>0</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QFrame" name="frame_4">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0">
        <widget class="QComboBox" name="m_GenerationBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <item>
          <property name="text">
           <string>Tract Density Image (TDI)</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Binary Envelope</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Fiber Bundle Image</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Fiber Endings Image</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string>Fiber Endings Pointset</string>
          </property>
         </item>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QSpinBox" name="m_UpsamplingSpinBox">
         <property name="toolTip">
          <string>Upsampling Factor</string>
         </property>
         <property name="minimum">
          <number>1</number>
         </property>
         <property name="maximum">
          <number>10</number>
         </property>
         <property name="value">
          <number>4</number>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QCommandLinkButton" name="m_GenerationStartButton">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="maximumSize">
          <size>
           <width>200</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="font">
          <font>
           <pointsize>11</pointsize>
          </font>
         </property>
         <property name="toolTip">
          <string comment="Perform selected operation on fiber bundle" extracomment="Perform selected operation on fiber bundle">Perform selected operation on fiber bundle</string>
         </property>
         <property name="text">
          <string>Generate</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QCheckBox" name="m_InvertCheckbox">
         <property name="toolTip">
          <string comment="If selected operation generates an image, the inverse image is returned" extracomment="If selected operation generates an image, the inverse image is returned">If selected operation generates an image, the inverse image is returned</string>
         </property>
         <property name="text">
          <string>Invert</string>
         </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>
  <resources>
   <include location="../../resources/QmitkDiffusionImaging.qrc"/>
  </resources>
  <connections/>
 </ui>