diff --git a/Modules/QtWidgetsExt/QmitkPiecewiseFunctionCanvas.cpp b/Modules/QtWidgetsExt/QmitkPiecewiseFunctionCanvas.cpp
index 7266def5e6..af340a58d1 100755
--- a/Modules/QtWidgetsExt/QmitkPiecewiseFunctionCanvas.cpp
+++ b/Modules/QtWidgetsExt/QmitkPiecewiseFunctionCanvas.cpp
@@ -1,158 +1,158 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "QmitkPiecewiseFunctionCanvas.h"
 
 #include <QPainter>
 #include <QLineEdit>
 
 QmitkPiecewiseFunctionCanvas::QmitkPiecewiseFunctionCanvas(QWidget * parent,
     Qt::WindowFlags f) :
   QmitkTransferFunctionCanvas(parent, f), m_PiecewiseFunction(0)
 {
   // used for drawing a border
   setContentsMargins(1,1,1,1);
 }
 
 void QmitkPiecewiseFunctionCanvas::SetTitle(const QString& title)
 {
   m_Title=title;
 }
 
 void QmitkPiecewiseFunctionCanvas::paintEvent(QPaintEvent*)
 {
   QPainter painter(this);
 
   PaintHistogram(painter);
 
   if (m_Title.size()>0)
   {
     painter.setPen(Qt::black);
     painter.drawText(QPoint(11,21),m_Title);
     painter.setPen(Qt::white);
     painter.drawText(QPoint(10,20),m_Title);
   }
 
   {
     QString qs_min = QString::number( m_Min );
     QString qs_max = QString::number( m_Max );
 
     QRect qr_min = painter.fontMetrics().boundingRect( qs_min );
     QRect qr_max = painter.fontMetrics().boundingRect( qs_max );
 
     int y,x;
 
     y=this->contentsRect().height()-qr_min.height()+5;
     x=10;
 
     // Fill the tf presets in the generator widget
 
     painter.setPen(Qt::black);
     painter.drawText(QPoint(x+1,y+1),qs_min);
     painter.setPen(Qt::white);
     painter.drawText(QPoint(x  ,y  ),qs_min);
 
     y=this->contentsRect().height()-qr_max.height()+5;
     x=this->contentsRect().width()-qr_max.width()-6;
 
     painter.setPen(Qt::black);
     painter.drawText(QPoint(x,y+1),qs_max);
     painter.setPen(Qt::white);
     painter.drawText(QPoint(x,y  ),qs_max);
   }
 
   painter.setPen(Qt::gray);
 
   QRect contentsRect = this->contentsRect();
   painter.drawRect(0, 0, contentsRect.width()+1, contentsRect.height()+1);
   if (m_PiecewiseFunction && this->isEnabled())
   {
     double* dp = m_PiecewiseFunction->GetDataPointer();
 
     // Render lines
 
     painter.setPen(Qt::black);
 
     for (int i = -1; i < m_PiecewiseFunction->GetSize(); i++)
     {
       std::pair<int,int> left;
       std::pair<int,int> right;
 
       if(i < 0)
         left = this->FunctionToCanvas(std::make_pair(-32768, dp[0 * 2 + 1]));
       else
         left = this->FunctionToCanvas(std::make_pair(dp[i * 2], dp[i * 2 + 1]));
 
       if(i+1 >= m_PiecewiseFunction->GetSize())
         right = this->FunctionToCanvas(std::make_pair(32768, dp[(i  ) * 2 + 1]));
       else
         right = this->FunctionToCanvas(std::make_pair(dp[(i+1) * 2], dp[(i+1) * 2 + 1]));
 
       painter.drawLine(left.first, left.second, right.first, right.second);
     }
 
     // Render Points
 
     for (int i = 0; i < m_PiecewiseFunction->GetSize(); i++)
     {
       std::pair<int,int> point = this->FunctionToCanvas(std::make_pair(
           dp[i * 2], dp[i * 2 + 1]));
 
       if (i == m_GrabbedHandle)
       {
         painter.setBrush(QBrush(Qt::red));
         if (m_LineEditAvailable)
         {
-          m_XEdit->setText(QString::number(GetFunctionX(m_GrabbedHandle)));
-          m_YEdit->setText(QString::number(GetFunctionY(m_GrabbedHandle)));
+          m_XEdit->setText(QString::number(GetFunctionX(m_GrabbedHandle), 'f', 2));
+          m_YEdit->setText(QString::number(GetFunctionY(m_GrabbedHandle), 'f', 2));
         }
       }
       else
       {
         painter.setBrush(QBrush(Qt::green));
       }
       painter.drawEllipse(point.first - 4, point.second - 4, 8, 8);
     }
 
     painter.setBrush(Qt::NoBrush);
   }
 }
 
 int QmitkPiecewiseFunctionCanvas::GetNearHandle(int x, int y,
     unsigned int maxSquaredDistance)
 {
   double* dp = m_PiecewiseFunction->GetDataPointer();
   for (int i = 0; i < m_PiecewiseFunction->GetSize(); i++)
   {
     std::pair<int,int> point = this->FunctionToCanvas(std::make_pair(dp[i * 2],
         dp[i * 2 + 1]));
     if ((unsigned int) ((point.first - x) * (point.first - x) + (point.second
         - y) * (point.second - y)) <= maxSquaredDistance)
     {
       return i;
 
     }
   }
   return -1;
 }
 
 void QmitkPiecewiseFunctionCanvas::MoveFunctionPoint(int index,
     std::pair<double,double> pos)
 {
   RemoveFunctionPoint(GetFunctionX(index));
   m_GrabbedHandle = AddFunctionPoint(pos.first, pos.second);
 }
 
diff --git a/Modules/QtWidgetsExt/QmitkTransferFunctionWidget.ui b/Modules/QtWidgetsExt/QmitkTransferFunctionWidget.ui
index 91690816dc..daa42305ef 100755
--- a/Modules/QtWidgetsExt/QmitkTransferFunctionWidget.ui
+++ b/Modules/QtWidgetsExt/QmitkTransferFunctionWidget.ui
@@ -1,521 +1,557 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkTransferFunctionWidget</class>
  <widget class="QWidget" name="QmitkTransferFunctionWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>300</width>
     <height>542</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
     <horstretch>1</horstretch>
     <verstretch>1</verstretch>
    </sizepolicy>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QmitkFloatingPointSpanSlider" name="m_RangeSlider">
        <property name="toolTip">
         <string>Change transfer function window range.</string>
        </property>
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="m_RangeSliderReset">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="maximumSize">
         <size>
          <width>48</width>
          <height>16777215</height>
         </size>
        </property>
        <property name="toolTip">
         <string>Resets range to histogram minimum and maximum.</string>
        </property>
        <property name="text">
         <string>Reset</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QWidget" name="m_ScalarOpacityWidget" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>3</verstretch>
       </sizepolicy>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
-      <property name="margin">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
        <widget class="QmitkPiecewiseFunctionCanvas" name="m_ScalarOpacityFunctionCanvas" native="true">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
           <horstretch>0</horstretch>
           <verstretch>1</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize">
          <size>
           <width>0</width>
           <height>64</height>
          </size>
         </property>
         <property name="font">
          <font/>
         </property>
         <property name="toolTip">
          <string>Left-click to select a point or add a new point.
 Hold left mouse button to move selected point.
 Click right mouse button to delete a point.</string>
         </property>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout">
         <item>
          <widget class="QLineEdit" name="m_XEditScalarOpacity">
           <property name="enabled">
            <bool>true</bool>
           </property>
           <property name="sizePolicy">
            <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="minimumSize">
            <size>
-            <width>48</width>
+            <width>64</width>
             <height>0</height>
            </size>
           </property>
           <property name="maximumSize">
            <size>
-            <width>48</width>
+            <width>64</width>
             <height>16777215</height>
            </size>
           </property>
           <property name="toolTip">
            <string>Edit x-coordinate (grayvalue) of currently selected point.</string>
           </property>
           <property name="text">
            <string/>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLabel" name="m_textLabelX">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="font">
            <font/>
           </property>
           <property name="toolTip">
            <string>Edit x-coordinate (grayvalue) of currently selected point.</string>
           </property>
           <property name="text">
            <string>Grayvalue</string>
           </property>
           <property name="wordWrap">
            <bool>false</bool>
           </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>
         <item>
          <widget class="QLabel" name="m_textLabelY">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="font">
            <font/>
           </property>
           <property name="toolTip">
            <string>Edit y-coordinate (opacity) of currently selected point.</string>
           </property>
           <property name="text">
            <string>Opacity</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
           <property name="wordWrap">
            <bool>false</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLineEdit" name="m_YEditScalarOpacity">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="minimumSize">
            <size>
-            <width>48</width>
+            <width>64</width>
             <height>0</height>
            </size>
           </property>
           <property name="maximumSize">
            <size>
-            <width>48</width>
+            <width>64</width>
             <height>16777215</height>
            </size>
           </property>
           <property name="toolTip">
            <string>Edit y-coordinate (opacity) of currently selected point.</string>
           </property>
           <property name="text">
            <string/>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QWidget" name="m_ColorWidget" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
-      <property name="margin">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
        <widget class="QmitkColorTransferFunctionCanvas" name="m_ColorTransferFunctionCanvas" native="true">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>1</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize">
          <size>
           <width>0</width>
           <height>48</height>
          </size>
         </property>
         <property name="font">
          <font/>
         </property>
         <property name="toolTip">
          <string>Left-click to select a point or add a new point.
 Hold left mouse button to move selected point.
 Click right mouse button to delete a point.
 Double-click left mouse button to change color of a point.</string>
         </property>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout">
         <item>
          <widget class="QLineEdit" name="m_XEditColor">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="minimumSize">
            <size>
-            <width>48</width>
+            <width>64</width>
             <height>0</height>
            </size>
           </property>
           <property name="maximumSize">
            <size>
-            <width>48</width>
+            <width>64</width>
             <height>16777215</height>
            </size>
           </property>
           <property name="toolTip">
            <string>Edit x-coordinate (grayvalue) of currently selected point.</string>
           </property>
           <property name="text">
            <string/>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLabel" name="m_textLabelX_3">
           <property name="font">
            <font/>
           </property>
           <property name="toolTip">
            <string>Edit x-coordinate (grayvalue) of currently selected point.</string>
           </property>
           <property name="text">
            <string>Grayvalue</string>
           </property>
           <property name="wordWrap">
            <bool>false</bool>
           </property>
          </widget>
         </item>
         <item>
          <spacer name="horizontalSpacer_4">
           <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>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QWidget" name="m_GradientOpacityWidget" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>2</verstretch>
       </sizepolicy>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_4">
-      <property name="margin">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
        <number>0</number>
       </property>
       <item>
        <widget class="QmitkPiecewiseFunctionCanvas" name="m_GradientOpacityCanvas" native="true">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
           <horstretch>0</horstretch>
           <verstretch>1</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize">
          <size>
           <width>0</width>
           <height>64</height>
          </size>
         </property>
         <property name="font">
          <font/>
         </property>
         <property name="toolTip">
          <string>Left-click to select a point or add a new point.
 Hold left mouse button to move selected point.
 Click right mouse button to delete a point.</string>
         </property>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout">
         <item>
          <widget class="QLineEdit" name="m_XEditGradientOpacity">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="minimumSize">
            <size>
-            <width>48</width>
+            <width>64</width>
             <height>0</height>
            </size>
           </property>
           <property name="maximumSize">
            <size>
-            <width>48</width>
+            <width>64</width>
             <height>16777215</height>
            </size>
           </property>
           <property name="toolTip">
            <string>Edit x-coordinate (grayvalue) of currently selected point.</string>
           </property>
           <property name="text">
            <string/>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLabel" name="m_textLabelX_2">
           <property name="font">
            <font/>
           </property>
           <property name="toolTip">
            <string>Edit x-coordinate (grayvalue) of currently selected point.</string>
           </property>
           <property name="text">
            <string>Grayvalue</string>
           </property>
           <property name="wordWrap">
            <bool>false</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>
         <item>
          <widget class="QLabel" name="m_textLabelY_2">
           <property name="font">
            <font/>
           </property>
           <property name="toolTip">
            <string>Edit y-coordinate (opacity) of currently selected point.</string>
           </property>
           <property name="text">
            <string>Opacity</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
           <property name="wordWrap">
            <bool>false</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QLineEdit" name="m_YEditGradientOpacity">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="minimumSize">
            <size>
-            <width>48</width>
+            <width>64</width>
             <height>0</height>
            </size>
           </property>
           <property name="maximumSize">
            <size>
-            <width>48</width>
+            <width>64</width>
             <height>16777215</height>
            </size>
           </property>
           <property name="toolTip">
            <string>Edit y-coordinate (opacity) of currently selected point.</string>
           </property>
           <property name="text">
            <string/>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
          </widget>
         </item>
        </layout>
       </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>0</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>QmitkPiecewiseFunctionCanvas</class>
    <extends>QWidget</extends>
    <header>QmitkPiecewiseFunctionCanvas.h</header>
   </customwidget>
   <customwidget>
    <class>QmitkColorTransferFunctionCanvas</class>
    <extends>QWidget</extends>
    <header>QmitkColorTransferFunctionCanvas.h</header>
   </customwidget>
   <customwidget>
    <class>QmitkFloatingPointSpanSlider</class>
    <extends>QSlider</extends>
    <header location="global">QmitkFloatingPointSpanSlider.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>