diff --git a/Modules/RenderWindowManagerUI/include/QmitkDataStorageRenderWindowInspector.h b/Modules/RenderWindowManagerUI/include/QmitkDataStorageRenderWindowInspector.h
index 89e9200549..a646220ef1 100644
--- a/Modules/RenderWindowManagerUI/include/QmitkDataStorageRenderWindowInspector.h
+++ b/Modules/RenderWindowManagerUI/include/QmitkDataStorageRenderWindowInspector.h
@@ -1,95 +1,95 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #ifndef QMITKDATASTORAGERENDERWINDOWINSPECTOR_H
 #define QMITKDATASTORAGERENDERWINDOWINSPECTOR_H
 
 // render window manager UI module
 #include "MitkRenderWindowManagerUIExports.h"
-#include "ui_QmitkRenderWindowManipulatorWidget.h"
+#include "ui_QmitkDataStorageRenderWindowInspector.h"
 
 // render window manager module
 #include <mitkRenderWindowViewDirectionController.h>
 #include <QmitkDataStorageRenderWindowListModel.h>
 
 // qt widgets module
 #include <QmitkAbstractDataStorageInspector.h>
 
 /**
 * The 'QmitkDataStorageRenderWindowInspector' offers a GUI to manipulate the base renderer / render windows of the MITK workbench.
 * The widgets supports adding a layer to an active render window, moving layers up and down, removing layers,
 * resetting layers (hiding them) or removing all layers at once.
 *
 * In order to use this widget, a (e.g.) plugin has to set the controlled renderer, which will be forwarded to
 * a render window view direction controller.
 */
 class MITKRENDERWINDOWMANAGERUI_EXPORT QmitkDataStorageRenderWindowInspector : public QmitkAbstractDataStorageInspector
 {
   Q_OBJECT
 
 public:
 
   QmitkDataStorageRenderWindowInspector(QWidget* parent = nullptr);
 
   // override from 'QmitkAbstractDataStorageInspector'
   /**
   * @brief See 'QmitkAbstractDataStorageInspector'
   */
   virtual QAbstractItemView* GetView() override;
   /**
   * @brief See 'QmitkAbstractDataStorageInspector'
   */
   virtual const QAbstractItemView* GetView() const override;
   /**
   * @brief See 'QmitkAbstractDataStorageInspector'
   */
   virtual void SetSelectionMode(SelectionMode mode) override;
   /**
   * @brief See 'QmitkAbstractDataStorageInspector'
   */
   virtual SelectionMode GetSelectionMode() const override;
   /**
   * @brief Set the controlled base renderer.
   */
   void SetControlledRenderer(mitk::RenderWindowLayerUtilities::RendererVector controlledRenderer);
   /**
   * @brief Set the currently selected render window.
   *
   * @param renderWindowId   the text inside the combo box
   */
   void SetActiveRenderWindow(const QString& renderWindowId);
 
 private Q_SLOTS:
 
   void SetAsBaseLayer();
 
   void ResetRenderer();
   void ClearRenderer();
 
   void ChangeViewDirection(const QString& viewDirection);
 
 private:
 
   virtual void Initialize() override;
   void SetUpConnections();
 
-  Ui::QmitkRenderWindowManipulatorWidget m_Controls;
+  Ui::QmitkDataStorageRenderWindowInspector m_Controls;
 
   std::unique_ptr<QmitkDataStorageRenderWindowListModel> m_StorageModel;
   std::unique_ptr<mitk::RenderWindowViewDirectionController> m_RenderWindowViewDirectionController;
 };
 
 #endif // QMITKDATASTORAGERENDERWINDOWINSPECTOR_H
diff --git a/Modules/RenderWindowManagerUI/src/QmitkDataStorageRenderWindowInspector.ui b/Modules/RenderWindowManagerUI/src/QmitkDataStorageRenderWindowInspector.ui
index 12db90d00c..07c5b4c9ad 100644
--- a/Modules/RenderWindowManagerUI/src/QmitkDataStorageRenderWindowInspector.ui
+++ b/Modules/RenderWindowManagerUI/src/QmitkDataStorageRenderWindowInspector.ui
@@ -1,120 +1,92 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkDataStorageRenderWindowInspector</class>
  <widget class="QWidget" name="QmitkDataStorageRenderWindowInspector">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>308</width>
     <height>246</height>
    </rect>
   </property>
   <property name="sizePolicy">
    <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>Render window manager</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Render window overview</string>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QListView" name="renderWindowListView"/>
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0">
-      <widget class="QPushButton" name="pushButtonAddLayer">
-       <property name="text">
-        <string>Add Layer</string>
-       </property>
-      </widget>
-     </item>
-	 <item row="0" column="1">
-      <widget class="QPushButton" name="pushButtonMoveUp">
-       <property name="text">
-        <string>Move up</string>
-       </property>
-      </widget>
-     </item>
-	 <item row="0" column="2">
+	 <item row="0" column="0">
       <widget class="QPushButton" name="pushButtonResetRenderer">
        <property name="text">
         <string>Reset render window</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QPushButton" name="pushButtonRemoveLayer">
-       <property name="text">
-        <string>Remove layer</string>
-       </property>
-      </widget>
-     </item>
-	 <item row="1" column="1">
-      <widget class="QPushButton" name="pushButtonMoveDown">
-       <property name="text">
-        <string>Move down</string>
-       </property>
-      </widget>
-     </item>
-	 <item row="1" column="2">
+	 <item row="0" column="1">
       <widget class="QPushButton" name="pushButtonClearRenderer">
        <property name="text">
         <string>Clear render window</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
+     <item row="0" column="2">
       <widget class="QPushButton" name="pushButtonSetAsBaseLayer">
        <property name="text">
         <string>Set as base layer</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
+     <item row="1" column="0">
       <widget class="QRadioButton" name="radioButtonAxial">
        <property name="text">
         <string>Axial</string>
        </property>
        <property name="checked">
         <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
+     <item row="1" column="1">
       <widget class="QRadioButton" name="radioButtonCoronal">
        <property name="text">
         <string>Coronal</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="2">
+     <item row="1" column="2">
       <widget class="QRadioButton" name="radioButtonSagittal">
        <property name="text">
         <string>Sagittal</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>