diff --git a/Modules/C3js/resource/Histogram.js b/Modules/C3js/resource/Histogram.js
index ff2b4b40a2..cd64c9f276 100644
--- a/Modules/C3js/resource/Histogram.js
+++ b/Modules/C3js/resource/Histogram.js
@@ -1,162 +1,169 @@
 document.body.style.backgroundColor = 'rgb(240, 240, 240)';
 
 var greyvalue; //needed to display the tooltip in the right format
 var binSize = 10;
 var min;
 var max;
 
+var minHeight = 255;
+
 var chart = c3.generate({
     data: {
         x : 'x', //use first "column" as x axis values
         columns: [],  //initialize empty. Data will be loaded in function setupChart(initValues)
         type: 'bar',
         selection: {
           enabled: false,
           multiple: false,
         }
     },
     grid: {
       y: {
         lines: [{value:0}] //Draws a horizontal line at y=0
       }
     },
     bar: {
         width: {
             ratio: 0.95 // this makes bar width 95% of length between ticks
         }
     },
     zoom: {
         enabled: true,
     },
     subchart: {
         show: true  //Shows a subchart that shows the region the primary chart is zoomed in to by overlay.
     }, 
     axis: {
         x: {
           type: 'category', //only for type 'category' the bars will be rescaled in width on zoom
           tick: {
             multiline: false,
             fit: false, //to make more x labels appear on zoom
             centered: true,
           },
         },
         y: {
           tick: {
             format: d3.format("s"),
           },
           //for some reason, there is an offset for our linegraph. This is prevented by the following lines
           min: 0,
           padding: { top: 0, bottom: 0 }
         }
     },
     //Style data points in linegraph
     point: {
         r: 0.2,
         focus: 
         {
           expand: {
             r: 4
           }
         }
     },
     tooltip: {
       format: {
         title: function (d) {
           var endValue = (parseFloat(greyvalue[d]) + binSize);
           endValue = endValue.toFixed(3);
           return 'Greyvalue: ' + greyvalue[d] + '...' + endValue;
         },
       }
     }
 });
 
 var initValues;
 window.onload = function() 
 {
   new QWebChannel(qt.webChannelTransport, function(channel) {
     initValues = channel.objects.initValues;
 
     setupChart(initValues)
   });
 }
 
 //This is necessary to resize the chart, after the size of the parent changed
 window.onresize = function () {
+  var size = window.innerHeight-(window.innerHeight/100*10); //subtract 5% of height to hide vertical scrool bar
+  
+  if (size < minHeight)
+  {
+    size = minHeight;
+  }
+
   chart.resize({
-    height: window.innerHeight-(window.innerHeight/100*5), //subtract 5% of height to hide vertical scrool bar
+    height: size,
   });
 }
 
 function setupChart(initValues)
 {
-  chart.resize({
-    height: window.innerHeight - (window.innerHeight / 100 * 5),
-  });
+  window.onresize();
 
   calcBinSize(initValues);
 
   //copy measurements to xValues for x-axis-labels and to greyvalues for tooltips
   var xValues = initValues.m_Measurement.slice(0);
   greyvalue = initValues.m_Measurement.slice(0);
 
   for (var i = 0; i < xValues.length; i++)
   {
     greyvalue[i] = greyvalue[i] - (binSize / 2);
     greyvalue[i] = greyvalue[i].toFixed(3);
     //change number format for x axis. Need to do it here, because it is not working on chart generation.
     xValues[i] = xValues[i];
     xValues[i] = xValues[i].toFixed();
     xValues[i] = d3.format("s")(xValues[i]);
   }
 
   xValues.unshift('x'); //add label to x array
   xValues.push(null); //append null value, to make sure the last tick on x-axis is displayed correctly
   var yValues = initValues.m_Frequency;
   yValues.unshift('Frequency'); //add label to y array
   xValues.push(null); //append null value, to make sure the last tick on x-axis is displayed correctly
 
   chart.unload(); //unload data before loading new data
   chart.load({
         columns:[
           xValues,
           yValues
         ]
   });
 
   if (initValues.useLineGraph) {
     chart.transform('line');
   }
 }
 
 /*
  * Calculation of the bin size.
  */
 function calcBinSize(initValues) {
   if (1 < initValues.m_Measurement.length) {
     min = d3.min(initValues.m_Measurement);
     max = d3.max(initValues.m_Measurement);
     binSize = ((max - min) / (initValues.m_Measurement.length - 1));
   }
   else {
     binSize = 10;
   }
 }
 
 //Transforamtion between bar and line chart
 //takes the name of the chart type as a parameter
 //calles by QmitkC3jsWidget
 function transformView(TransformTo) {
   chart.transform(TransformTo);
 };
 
 function changeTheme(color) {
   if (color == 'dark') {
     link = document.getElementsByTagName("link")[0];
     link.href = "Histogram_dark.css";
   }
   else
   {
     link = document.getElementsByTagName("link")[0];
     link.href = "Histogram.css";
   }
 };
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.ui b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.ui
index 2e0549c2b2..ce03158490 100644
--- a/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsViewControls.ui
@@ -1,624 +1,630 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkImageStatisticsViewControls</class>
  <widget class="QWidget" name="QmitkImageStatisticsViewControls">
   <property name="enabled">
    <bool>true</bool>
   </property>
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>548</width>
     <height>800</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_4">
    <item>
     <layout class="QGridLayout" name="gridLayout_2">
      <item row="0" column="0">
       <widget class="QLabel" name="label">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="layoutDirection">
         <enum>Qt::LeftToRight</enum>
        </property>
        <property name="text">
         <string>Feature Image: </string>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
       <widget class="QLabel" name="m_SelectedFeatureImageLabel">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>None</string>
        </property>
       </widget>
      </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_2">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>Mask:</string>
        </property>
       </widget>
      </item>
      <item row="1" column="1">
       <widget class="QLabel" name="m_SelectedMaskLabel">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="text">
         <string>None</string>
        </property>
        <property name="indent">
         <number>-1</number>
        </property>
       </widget>
      </item>
      <item row="1" column="2">
       <widget class="QLabel" name="m_ErrorMessageLabel">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="styleSheet">
         <string notr="true">color: rgb(255, 0, 0);</string>
        </property>
        <property name="text">
         <string>Error Message</string>
        </property>
        <property name="textFormat">
         <enum>Qt::AutoText</enum>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QCheckBox" name="m_IgnoreZerosCheckbox">
      <property name="text">
       <string>Ignore zero-valued voxels</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="title">
       <string>Statistics</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
       <property name="leftMargin">
        <number>9</number>
       </property>
       <property name="rightMargin">
        <number>9</number>
       </property>
       <property name="bottomMargin">
        <number>9</number>
       </property>
       <item>
        <widget class="QTableWidget" name="m_StatisticsTable">
         <property name="minimumSize">
          <size>
           <width>100</width>
           <height>180</height>
          </size>
         </property>
         <property name="maximumSize">
          <size>
           <width>16777215</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="verticalScrollBarPolicy">
          <enum>Qt::ScrollBarAsNeeded</enum>
         </property>
         <property name="horizontalScrollBarPolicy">
          <enum>Qt::ScrollBarAsNeeded</enum>
         </property>
         <property name="autoScroll">
          <bool>true</bool>
         </property>
         <property name="editTriggers">
          <set>QAbstractItemView::NoEditTriggers</set>
         </property>
         <property name="alternatingRowColors">
          <bool>true</bool>
         </property>
         <property name="showGrid">
          <bool>true</bool>
         </property>
         <property name="gridStyle">
          <enum>Qt::DotLine</enum>
         </property>
         <property name="cornerButtonEnabled">
          <bool>false</bool>
         </property>
         <property name="rowCount">
          <number>14</number>
         </property>
         <attribute name="horizontalHeaderVisible">
          <bool>false</bool>
         </attribute>
         <attribute name="horizontalHeaderCascadingSectionResizes">
          <bool>false</bool>
         </attribute>
         <attribute name="horizontalHeaderDefaultSectionSize">
          <number>80</number>
         </attribute>
         <attribute name="horizontalHeaderHighlightSections">
          <bool>true</bool>
         </attribute>
         <attribute name="horizontalHeaderMinimumSectionSize">
          <number>80</number>
         </attribute>
         <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
          <bool>false</bool>
         </attribute>
         <attribute name="horizontalHeaderStretchLastSection">
          <bool>true</bool>
         </attribute>
         <attribute name="verticalHeaderVisible">
          <bool>false</bool>
         </attribute>
         <attribute name="verticalHeaderCascadingSectionResizes">
          <bool>false</bool>
         </attribute>
         <attribute name="verticalHeaderDefaultSectionSize">
          <number>25</number>
         </attribute>
         <attribute name="verticalHeaderMinimumSectionSize">
          <number>25</number>
         </attribute>
         <attribute name="verticalHeaderShowSortIndicator" stdset="0">
          <bool>false</bool>
         </attribute>
         <attribute name="verticalHeaderStretchLastSection">
          <bool>false</bool>
         </attribute>
         <row>
          <property name="text">
           <string>Mean</string>
          </property>
         </row>
         <row>
          <property name="text">
           <string>Median</string>
          </property>
         </row>
         <row>
          <property name="text">
           <string>StdDev</string>
          </property>
         </row>
         <row>
          <property name="text">
           <string>RMS</string>
          </property>
         </row>
         <row>
          <property name="text">
           <string>Max</string>
          </property>
         </row>
         <row>
          <property name="text">
           <string>Min</string>
          </property>
         </row>
         <row>
          <property name="text">
           <string>N</string>
          </property>
         </row>
         <row>
          <property name="text">
           <string>V (mm³)</string>
          </property>
         </row>
         <row>
          <property name="text">
           <string>Skewness</string>
          </property>
         </row>
         <row>
          <property name="text">
           <string>Kurtosis</string>
          </property>
         </row>
         <row>
          <property name="text">
           <string>Uniformity</string>
          </property>
         </row>
         <row>
          <property name="text">
           <string>Entropy</string>
          </property>
         </row>
         <row>
          <property name="text">
           <string>MPP</string>
          </property>
         </row>
         <row>
          <property name="text">
           <string>UPP</string>
          </property>
         </row>
         <column>
          <property name="text">
           <string>0</string>
          </property>
         </column>
        </widget>
       </item>
       <item>
        <widget class="QWidget" name="widget" native="true">
         <layout class="QHBoxLayout" name="horizontalLayout">
          <property name="spacing">
           <number>0</number>
          </property>
          <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="QPushButton" name="m_ButtonCopyStatisticsToClipboard">
            <property name="text">
             <string>Copy to Clipboard</string>
            </property>
           </widget>
          </item>
          <item>
           <spacer name="horizontalSpacer_3">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeType">
             <enum>QSizePolicy::Fixed</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
              <width>20</width>
              <height>20</height>
             </size>
            </property>
           </spacer>
          </item>
          <item>
           <widget class="QCheckBox" name="m_CheckBox4dCompleteTable">
            <property name="enabled">
             <bool>false</bool>
            </property>
            <property name="text">
             <string>copy complete table</string>
            </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>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="minimumSize">
       <size>
-       <width>150</width>
-       <height>160</height>
+       <width>400</width>
+       <height>450</height>
       </size>
      </property>
      <property name="title">
       <string>Histogram</string>
      </property>
      <property name="checkable">
       <bool>false</bool>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <widget class="QGroupBox" name="groupBox_2">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="minimumSize">
          <size>
           <width>0</width>
           <height>0</height>
          </size>
         </property>
         <property name="maximumSize">
          <size>
           <width>16777215</width>
           <height>16777215</height>
          </size>
         </property>
         <property name="title">
          <string>Plot</string>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
           <layout class="QHBoxLayout" name="horizontalLayout_4">
            <item>
             <widget class="QRadioButton" name="m_barRadioButton">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="styleSheet">
               <string notr="true"/>
              </property>
              <property name="text">
               <string>Barchart</string>
              </property>
              <property name="checked">
               <bool>true</bool>
              </property>
             </widget>
            </item>
            <item>
             <widget class="QRadioButton" name="m_lineRadioButton">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
              <property name="minimumSize">
               <size>
                <width>0</width>
                <height>0</height>
               </size>
              </property>
              <property name="text">
               <string>Linegraph</string>
              </property>
             </widget>
            </item>
            <item>
             <spacer name="horizontalSpacer_6">
              <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>
          <item>
           <widget class="QCheckBox" name="m_UseDefaultBinSizeBox">
            <property name="text">
             <string>Use default bin size</string>
            </property>
            <property name="checked">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QFrame" name="m_BinSizeFrame">
            <property name="frameShape">
             <enum>QFrame::NoFrame</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
            </property>
            <layout class="QGridLayout" name="gridLayout">
             <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>
             <property name="spacing">
              <number>0</number>
             </property>
             <item row="0" column="0">
              <widget class="QLabel" name="m_HistogramBinSizeCaptionLabel">
               <property name="minimumSize">
                <size>
                 <width>60</width>
                 <height>0</height>
                </size>
               </property>
               <property name="maximumSize">
                <size>
                 <width>100</width>
                 <height>16777215</height>
                </size>
               </property>
               <property name="text">
                <string>Bin size:</string>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
              <widget class="QDoubleSpinBox" name="m_HistogramBinSizeSpinbox">
               <property name="toolTip">
                <string>Press enter to recalculate statistics with new bin size.</string>
               </property>
               <property name="frame">
                <bool>true</bool>
               </property>
               <property name="decimals">
                <number>5</number>
               </property>
               <property name="minimum">
                <double>0.000010000000000</double>
               </property>
               <property name="maximum">
                <double>1000000.000000000000000</double>
               </property>
               <property name="value">
                <double>10.000000000000000</double>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item>
        <widget class="QStackedWidget" name="m_StatisticsWidgetStack">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
         <property name="currentIndex">
          <number>0</number>
         </property>
         <widget class="QmitkC3jsWidget" name="m_JSHistogram">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
         </widget>
        </widget>
       </item>
       <item>
        <widget class="QLabel" name="m_InfoLabel">
         <property name="text">
          <string/>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QWidget" name="widget_2" native="true">
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <property name="spacing">
           <number>0</number>
          </property>
          <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="QPushButton" name="m_ButtonCopyHistogramToClipboard">
            <property name="text">
             <string>Copy to Clipboard</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>
+             <width>413</width>
+             <height>17</height>
             </size>
            </property>
           </spacer>
          </item>
         </layout>
        </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>
  <customwidgets>
   <customwidget>
    <class>QmitkC3jsWidget</class>
    <extends>QWidget</extends>
    <header location="global">QmitkC3jsWidget.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>