diff --git a/Plugins/org.mitk.gui.qt.volumevisualization/files.cmake b/Plugins/org.mitk.gui.qt.volumevisualization/files.cmake
index 79fc343d0d..9e8ccb395d 100755
--- a/Plugins/org.mitk.gui.qt.volumevisualization/files.cmake
+++ b/Plugins/org.mitk.gui.qt.volumevisualization/files.cmake
@@ -1,37 +1,22 @@
-set(SRC_CPP_FILES
-
-)
-
 set(INTERNAL_CPP_FILES
   mitkPluginActivator.cpp
   QmitkVolumeVisualizationView.cpp
 )
 
 set(UI_FILES
   src/internal/QmitkVolumeVisualizationViewControls.ui
 )
 
 set(MOC_H_FILES
   src/internal/mitkPluginActivator.h
   src/internal/QmitkVolumeVisualizationView.h
 )
 
 set(CACHED_RESOURCE_FILES
   plugin.xml
   resources/volume_visualization.svg
 )
 
-set(QRC_FILES
-
-)
-
-
-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})
diff --git a/Plugins/org.mitk.gui.qt.volumevisualization/plugin.xml b/Plugins/org.mitk.gui.qt.volumevisualization/plugin.xml
index 3766778b5f..8a25a0a5b5 100755
--- a/Plugins/org.mitk.gui.qt.volumevisualization/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.volumevisualization/plugin.xml
@@ -1,38 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?BlueBerry version="0.1"?>
 <plugin>
   <extension point="org.blueberry.ui.views">
-    <view
-      id="org.mitk.views.volumevisualization"
-      name="Volume Visualization"
-      class="QmitkVolumeVisualizationView"
-      icon="resources/volume_visualization.svg"
-      category="General" >
+    <view id="org.mitk.views.volumevisualization"
+          name="Volume Visualization"
+          class="QmitkVolumeVisualizationView"
+          icon="resources/volume_visualization.svg"
+          category="General">
       <description>Configure the 3D-Visualization of images.</description>
       <keywordReference id="org.mitk.views.volumevisualization.ViewKeyword"/>
     </view>
   </extension>
 
   <extension point="org.blueberry.ui.keywords">
     <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="Visualisation" />
     <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="3D" />
     <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="Rendering" />
     <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="Volumevisualisation" />
     <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="Look-up-table" />
     <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="Color Colour" />
   </extension>
 
   <!--This extension points adds the volume visualization view to the
   "Window->Show Views" menu if the visualization perspective is opened-->
   <extension point="org.blueberry.ui.perspectiveExtensions">
-            <perspectiveExtension
-                 targetID="org.mitk.mitkworkbench.perspectives.visualization">
-                 <viewShortcut id="org.mitk.views.volumevisualization"/>
-                 <view id="org.mitk.views.volumevisualization"
-                             relative="org.mitk.views.datamanager"
-                             relationship="bottom"
-                             ratio="0.80"
-                             visible="false"/>
-            </perspectiveExtension>
+    <perspectiveExtension targetID="org.mitk.mitkworkbench.perspectives.visualization">
+        <viewShortcut id="org.mitk.views.volumevisualization"/>
+        <view id="org.mitk.views.volumevisualization"
+              relative="org.mitk.views.datamanager"
+              relationship="bottom"
+              ratio="0.80"
+              visible="false"/>
+	</perspectiveExtension>
   </extension>
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.cpp b/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.cpp
index 64503e75b9..51d291a500 100755
--- a/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.cpp
+++ b/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.cpp
@@ -1,345 +1,291 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #include "QmitkVolumeVisualizationView.h"
 
-#include <QComboBox>
-
-#include <vtkVersionMacros.h>
 #include <vtkSmartVolumeMapper.h>
 
-#include <berryISelectionProvider.h>
-#include <berryISelectionService.h>
-#include <berryIWorkbenchWindow.h>
-//#include <berryISelectionService.h>
-#include <mitkDataNodeObject.h>
-
-#include <mitkProperties.h>
-#include <mitkNodePredicateDataType.h>
+#include <mitkImage.h>
 
 #include <mitkTransferFunction.h>
-#include <mitkTransferFunctionProperty.h>
 #include <mitkTransferFunctionInitializer.h>
-#include "mitkHistogramGenerator.h"
-#include "QmitkPiecewiseFunctionCanvas.h"
-#include "QmitkColorTransferFunctionCanvas.h"
-
-#include "mitkBaseRenderer.h"
-
-#include "mitkVtkVolumeRenderingProperty.h"
+#include <mitkTransferFunctionProperty.h>
 
-#include <mitkIRenderingManager.h>
+#include <mitkNodePredicateDataType.h>
+#include <mitkNodePredicateDimension.h>
+#include <mitkNodePredicateAnd.h>
+#include <mitkNodePredicateNot.h>
+#include <mitkNodePredicateOr.h>
+#include <mitkNodePredicateProperty.h>
 
-#include <QToolTip>
+#include <mitkProperties.h>
 
-const std::string QmitkVolumeVisualizationView::VIEW_ID =
-"org.mitk.views.volumevisualization";
+const std::string QmitkVolumeVisualizationView::VIEW_ID = "org.mitk.views.volumevisualization";
 
-enum {DEFAULT_RENDERMODE = 0, RAYCAST_RENDERMODE = 1, GPU_RENDERMODE = 2};
+enum
+{
+  DEFAULT_RENDERMODE = 0,
+  RAYCAST_RENDERMODE = 1,
+  GPU_RENDERMODE = 2
+};
 
 QmitkVolumeVisualizationView::QmitkVolumeVisualizationView()
-: QmitkAbstractView(),
-  m_Controls(nullptr)
+  : QmitkAbstractView()
+  , m_Controls(nullptr)
 {
 }
 
-QmitkVolumeVisualizationView::~QmitkVolumeVisualizationView()
+void QmitkVolumeVisualizationView::SetFocus()
 {
 }
 
 void QmitkVolumeVisualizationView::CreateQtPartControl(QWidget* parent)
 {
-
-  if (!m_Controls)
+  m_Controls = new Ui::QmitkVolumeVisualizationViewControls;
+  m_Controls->setupUi(parent);
+
+  m_Controls->volumeSelectionWidget->SetDataStorage(GetDataStorage());
+  m_Controls->volumeSelectionWidget->SetNodePredicate(mitk::NodePredicateAnd::New(
+    mitk::TNodePredicateDataType<mitk::Image>::New(),
+    mitk::NodePredicateOr::New(mitk::NodePredicateDimension::New(3), mitk::NodePredicateDimension::New(4)),
+    mitk::NodePredicateNot::New(mitk::NodePredicateProperty::New("helper object"))));
+
+  m_Controls->volumeSelectionWidget->SetSelectionIsOptional(true);
+  m_Controls->volumeSelectionWidget->SetEmptyInfo(QString("Please select a 3D / 4D image volume"));
+  m_Controls->volumeSelectionWidget->SetPopUpTitel(QString("Select image volume"));
+
+  // Fill the transfer function presets in the generator widget
+  std::vector<std::string> names;
+  mitk::TransferFunctionInitializer::GetPresetNames(names);
+  for (const auto& name : names)
   {
-    m_Controls = new Ui::QmitkVolumeVisualizationViewControls;
-    m_Controls->setupUi(parent);
-
-    // Fill the tf presets in the generator widget
-    std::vector<std::string> names;
-    mitk::TransferFunctionInitializer::GetPresetNames(names);
-    for (std::vector<std::string>::const_iterator it = names.begin();
-         it != names.end(); ++it)
-    {
-      m_Controls->m_TransferFunctionGeneratorWidget->AddPreset(QString::fromStdString(*it));
-    }
-
-    // see enum in vtkSmartVolumeMapper
-    m_Controls->m_RenderMode->addItem("Default");
-    m_Controls->m_RenderMode->addItem("RayCast");
-    m_Controls->m_RenderMode->addItem("GPU");
-
-    // see vtkVolumeMapper::BlendModes
-    m_Controls->m_BlendMode->addItem("Comp");
-    m_Controls->m_BlendMode->addItem("Max");
-    m_Controls->m_BlendMode->addItem("Min");
-    m_Controls->m_BlendMode->addItem("Avg");
-    m_Controls->m_BlendMode->addItem("Add");
-
-    connect( m_Controls->m_EnableRenderingCB, SIGNAL( toggled(bool) ),this, SLOT( OnEnableRendering(bool) ));
-    connect(m_Controls->m_RenderMode, SIGNAL(activated(int)), this, SLOT(OnRenderMode(int)));
-    connect(m_Controls->m_BlendMode, SIGNAL(activated(int)), this, SLOT(OnBlendMode(int)));
-
-    connect( m_Controls->m_TransferFunctionGeneratorWidget, SIGNAL( SignalUpdateCanvas( ) ),   m_Controls->m_TransferFunctionWidget, SLOT( OnUpdateCanvas( ) ) );
-    connect( m_Controls->m_TransferFunctionGeneratorWidget, SIGNAL(SignalTransferFunctionModeChanged(int)), SLOT(OnMitkInternalPreset(int)));
-
-    m_Controls->m_EnableRenderingCB->setEnabled(false);
-    m_Controls->m_BlendMode->setEnabled(false);
-    m_Controls->m_RenderMode->setEnabled(false);
-    m_Controls->m_TransferFunctionWidget->setEnabled(false);
-    m_Controls->m_TransferFunctionGeneratorWidget->setEnabled(false);
-
-    m_Controls->m_SelectedImageLabel->hide();
-    m_Controls->m_ErrorImageLabel->hide();
+    m_Controls->transferFunctionGeneratorWidget->AddPreset(QString::fromStdString(name));
   }
+
+  // see enum in vtkSmartVolumeMapper
+  m_Controls->renderMode->addItem("Default");
+  m_Controls->renderMode->addItem("RayCast");
+  m_Controls->renderMode->addItem("GPU");
+
+  // see vtkVolumeMapper::BlendModes
+  m_Controls->blendMode->addItem("Comp");
+  m_Controls->blendMode->addItem("Max");
+  m_Controls->blendMode->addItem("Min");
+  m_Controls->blendMode->addItem("Avg");
+  m_Controls->blendMode->addItem("Add");
+
+  connect(m_Controls->volumeSelectionWidget, &QmitkSingleNodeSelectionWidget::CurrentSelectionChanged,
+    this, &QmitkVolumeVisualizationView::OnCurrentSelectionChanged);
+  connect(m_Controls->enableRenderingCB, SIGNAL(toggled(bool)), this, SLOT(OnEnableRendering(bool)));
+  connect(m_Controls->renderMode, SIGNAL(activated(int)), this, SLOT(OnRenderMode(int)));
+  connect(m_Controls->blendMode, SIGNAL(activated(int)), this, SLOT(OnBlendMode(int)));
+
+  connect(m_Controls->transferFunctionGeneratorWidget, SIGNAL(SignalUpdateCanvas()),
+          m_Controls->transferFunctionWidget, SLOT(OnUpdateCanvas()));
+  connect(m_Controls->transferFunctionGeneratorWidget, SIGNAL(SignalTransferFunctionModeChanged(int)),
+          SLOT(OnMitkInternalPreset(int)));
+
+  m_Controls->enableRenderingCB->setEnabled(false);
+  m_Controls->blendMode->setEnabled(false);
+  m_Controls->renderMode->setEnabled(false);
+  m_Controls->transferFunctionWidget->setEnabled(false);
+  m_Controls->transferFunctionGeneratorWidget->setEnabled(false);
 }
 
-void QmitkVolumeVisualizationView::OnMitkInternalPreset( int mode )
+void QmitkVolumeVisualizationView::OnMitkInternalPreset(int mode)
 {
-  if (m_SelectedNode.IsExpired()) return;
+  if (m_SelectedNode.IsExpired())
+  {
+    return;
+  }
 
   auto node = m_SelectedNode.Lock();
   mitk::TransferFunctionProperty::Pointer transferFuncProp;
   if (node->GetProperty(transferFuncProp, "TransferFunction"))
   {
-    //first item is only information
-    if( --mode == -1 )
+    // first item is only information
+    if (--mode == -1)
       return;
 
     // -- Creat new TransferFunction
     mitk::TransferFunctionInitializer::Pointer tfInit = mitk::TransferFunctionInitializer::New(transferFuncProp->GetValue());
     tfInit->SetTransferFunctionMode(mode);
     RequestRenderWindowUpdate();
-    m_Controls->m_TransferFunctionWidget->OnUpdateCanvas();
+    m_Controls->transferFunctionWidget->OnUpdateCanvas();
   }
 }
 
-
-void QmitkVolumeVisualizationView::OnSelectionChanged(berry::IWorkbenchPart::Pointer /*part*/, const QList<mitk::DataNode::Pointer>& nodes)
+void QmitkVolumeVisualizationView::OnCurrentSelectionChanged(QList<mitk::DataNode::Pointer> nodes)
 {
-  bool weHadAnImageButItsNotThreeDeeOrFourDee = false;
+  m_SelectedNode = nullptr;
 
-  mitk::DataNode::Pointer node;
-
-  for (mitk::DataNode::Pointer currentNode: nodes)
+  if (nodes.empty() || nodes.front().IsNull())
   {
-    if( currentNode.IsNotNull() && dynamic_cast<mitk::Image*>(currentNode->GetData()) )
-    {
-      if( dynamic_cast<mitk::Image*>(currentNode->GetData())->GetDimension()>=3 )
-      {
-        if (node.IsNull())
-        {
-          node = currentNode;
-        }
-      }
-      else
-      {
-        weHadAnImageButItsNotThreeDeeOrFourDee = true;
-      }
-    }
+    UpdateInterface();
+    return;
   }
 
-  if( node.IsNotNull() )
+  auto selectedNode = nodes.front();
+  auto image = dynamic_cast<mitk::Image*>(selectedNode->GetData());
+  if (nullptr != image)
   {
-    m_Controls->m_NoSelectedImageLabel->hide();
-    m_Controls->m_ErrorImageLabel->hide();
-    m_Controls->m_SelectedImageLabel->show();
-
-    std::string  infoText;
-
-    if (node->GetName().empty())
-      infoText = std::string("Selected Image: [currently selected image has no name]");
-    else
-      infoText = std::string("Selected Image: ") + node->GetName();
+    m_SelectedNode = selectedNode;
+  }
 
-    m_Controls->m_SelectedImageLabel->setText( QString( infoText.c_str() ) );
+  UpdateInterface();
+}
 
-    m_SelectedNode = node;
-  }
-  else
+void QmitkVolumeVisualizationView::OnEnableRendering(bool state)
+{
+  if (m_SelectedNode.IsExpired())
   {
-    if(weHadAnImageButItsNotThreeDeeOrFourDee)
-    {
-      m_Controls->m_NoSelectedImageLabel->hide();
-      m_Controls->m_ErrorImageLabel->show();
-      std::string  infoText;
-      infoText = std::string("only 3D or 4D images are supported");
-      m_Controls->m_ErrorImageLabel->setText( QString( infoText.c_str() ) );
-    }
-    else
-    {
-      m_Controls->m_SelectedImageLabel->hide();
-      m_Controls->m_ErrorImageLabel->hide();
-      m_Controls->m_NoSelectedImageLabel->show();
-    }
-
-    m_SelectedNode = nullptr;
+    return;
   }
 
+  m_SelectedNode.Lock()->SetProperty("volumerendering", mitk::BoolProperty::New(state));
   UpdateInterface();
+  RequestRenderWindowUpdate();
 }
 
-
-void QmitkVolumeVisualizationView::UpdateInterface()
+void QmitkVolumeVisualizationView::OnRenderMode(int mode)
 {
-  if(m_SelectedNode.IsExpired())
+  if (m_SelectedNode.IsExpired())
   {
-    // turnoff all
-    m_Controls->m_EnableRenderingCB->setChecked(false);
-    m_Controls->m_EnableRenderingCB->setEnabled(false);
-
-    m_Controls->m_BlendMode->setCurrentIndex(0);
-    m_Controls->m_BlendMode->setEnabled(false);
-
-    m_Controls->m_RenderMode->setCurrentIndex(0);
-    m_Controls->m_RenderMode->setEnabled(false);
-
-    m_Controls->m_TransferFunctionWidget->SetDataNode(nullptr);
-    m_Controls->m_TransferFunctionWidget->setEnabled(false);
-
-    m_Controls->m_TransferFunctionGeneratorWidget->SetDataNode(nullptr);
-    m_Controls->m_TransferFunctionGeneratorWidget->setEnabled(false);
     return;
   }
 
-  bool enabled = false;
   auto selectedNode = m_SelectedNode.Lock();
 
-  selectedNode->GetBoolProperty("volumerendering",enabled);
-  m_Controls->m_EnableRenderingCB->setEnabled(true);
-  m_Controls->m_EnableRenderingCB->setChecked(enabled);
-
-  if(!enabled)
+  bool usegpu = false;
+  bool useray = false;
+  if (DEFAULT_RENDERMODE == mode)
   {
-    // turnoff all except volumerendering checkbox
-    m_Controls->m_BlendMode->setCurrentIndex(0);
-    m_Controls->m_BlendMode->setEnabled(false);
-
-    m_Controls->m_RenderMode->setCurrentIndex(0);
-    m_Controls->m_RenderMode->setEnabled(false);
-
-    m_Controls->m_TransferFunctionWidget->SetDataNode(nullptr);
-    m_Controls->m_TransferFunctionWidget->setEnabled(false);
-
-    m_Controls->m_TransferFunctionGeneratorWidget->SetDataNode(nullptr);
-    m_Controls->m_TransferFunctionGeneratorWidget->setEnabled(false);
-    return;
+    useray = true;
+    usegpu = true;
   }
-
-  // otherwise we can activate em all
-  m_Controls->m_BlendMode->setEnabled(true);
-  m_Controls->m_RenderMode->setEnabled(true);
-
-  // Determine Combo Box mode
+  else if (GPU_RENDERMODE == mode)
   {
-    bool usegpu=false;
-    bool useray=false;
-    bool usemip=false;
-    selectedNode->GetBoolProperty("volumerendering.usegpu",usegpu);
-    selectedNode->GetBoolProperty("volumerendering.useray",useray);
-    selectedNode->GetBoolProperty("volumerendering.usemip",usemip);
-
-    int blendMode;
-    if (selectedNode->GetIntProperty("volumerendering.blendmode", blendMode))
-      m_Controls->m_BlendMode->setCurrentIndex(blendMode);
-
-    if (usemip)
-      m_Controls->m_BlendMode->setCurrentIndex(vtkVolumeMapper::MAXIMUM_INTENSITY_BLEND);
-
-    int mode = DEFAULT_RENDERMODE;
-
-    if (useray)
-      mode = RAYCAST_RENDERMODE;
-    else if(usegpu)
-      mode = GPU_RENDERMODE;
-
-    m_Controls->m_RenderMode->setCurrentIndex(mode);
-
+    usegpu = true;
+  }
+  else if (RAYCAST_RENDERMODE == mode)
+  {
+    useray = true;
   }
 
-  m_Controls->m_TransferFunctionWidget->SetDataNode(selectedNode);
-  m_Controls->m_TransferFunctionWidget->setEnabled(true);
-  m_Controls->m_TransferFunctionGeneratorWidget->SetDataNode(selectedNode);
-  m_Controls->m_TransferFunctionGeneratorWidget->setEnabled(true);
-}
-
-
-void QmitkVolumeVisualizationView::OnEnableRendering(bool state)
-{
-  if(m_SelectedNode.IsExpired())
-    return;
+  selectedNode->SetProperty("volumerendering.usegpu", mitk::BoolProperty::New(usegpu));
+  selectedNode->SetProperty("volumerendering.useray", mitk::BoolProperty::New(useray));
 
-  m_SelectedNode.Lock()->SetProperty("volumerendering",mitk::BoolProperty::New(state));
-  UpdateInterface();
   RequestRenderWindowUpdate();
 }
 
 void QmitkVolumeVisualizationView::OnBlendMode(int mode)
 {
   if (m_SelectedNode.IsExpired())
+  {
     return;
+  }
 
   auto selectedNode = m_SelectedNode.Lock();
 
   bool usemip = false;
-  if (mode == vtkVolumeMapper::MAXIMUM_INTENSITY_BLEND)
+  if (vtkVolumeMapper::MAXIMUM_INTENSITY_BLEND == mode)
+  {
     usemip = true;
+  }
 
   selectedNode->SetProperty("volumerendering.usemip", mitk::BoolProperty::New(usemip));
   selectedNode->SetProperty("volumerendering.blendmode", mitk::IntProperty::New(mode));
 
   RequestRenderWindowUpdate();
 }
 
-void QmitkVolumeVisualizationView::OnRenderMode(int mode)
+void QmitkVolumeVisualizationView::UpdateInterface()
 {
-  if(m_SelectedNode.IsExpired())
+  if (m_SelectedNode.IsExpired())
+  {
+    // turnoff all
+    m_Controls->enableRenderingCB->setChecked(false);
+    m_Controls->enableRenderingCB->setEnabled(false);
+
+    m_Controls->blendMode->setCurrentIndex(0);
+    m_Controls->blendMode->setEnabled(false);
+
+    m_Controls->renderMode->setCurrentIndex(0);
+    m_Controls->renderMode->setEnabled(false);
+
+    m_Controls->transferFunctionWidget->SetDataNode(nullptr);
+    m_Controls->transferFunctionWidget->setEnabled(false);
+
+    m_Controls->transferFunctionGeneratorWidget->SetDataNode(nullptr);
+    m_Controls->transferFunctionGeneratorWidget->setEnabled(false);
     return;
+  }
 
+  bool enabled = false;
   auto selectedNode = m_SelectedNode.Lock();
 
-  bool usegpu = false;
-  if (mode == GPU_RENDERMODE)
-    usegpu = true;
-
-  bool useray = false;
-  if (mode == RAYCAST_RENDERMODE)
-    useray = true;
+  selectedNode->GetBoolProperty("volumerendering", enabled);
+  m_Controls->enableRenderingCB->setEnabled(true);
+  m_Controls->enableRenderingCB->setChecked(enabled);
 
-  if (mode == DEFAULT_RENDERMODE)
+  if (!enabled)
   {
-    useray = true;
-    usegpu = true;
-  }
+    // turnoff all except volumerendering checkbox
+    m_Controls->blendMode->setCurrentIndex(0);
+    m_Controls->blendMode->setEnabled(false);
 
-  selectedNode->SetProperty("volumerendering.usegpu",mitk::BoolProperty::New(usegpu));
-  selectedNode->SetProperty("volumerendering.useray",mitk::BoolProperty::New(useray));
+    m_Controls->renderMode->setCurrentIndex(0);
+    m_Controls->renderMode->setEnabled(false);
 
-  RequestRenderWindowUpdate();
-}
+    m_Controls->transferFunctionWidget->SetDataNode(nullptr);
+    m_Controls->transferFunctionWidget->setEnabled(false);
 
-void QmitkVolumeVisualizationView::SetFocus()
-{
+    m_Controls->transferFunctionGeneratorWidget->SetDataNode(nullptr);
+    m_Controls->transferFunctionGeneratorWidget->setEnabled(false);
+    return;
+  }
 
-}
+  // otherwise we can activate em all
+  m_Controls->blendMode->setEnabled(true);
+  m_Controls->renderMode->setEnabled(true);
 
-void QmitkVolumeVisualizationView::NodeRemoved(const mitk::DataNode* node)
-{
-  if(m_SelectedNode == node)
+  // Determine Combo Box mode
   {
-    m_SelectedNode = nullptr;
-    m_Controls->m_SelectedImageLabel->hide();
-    m_Controls->m_ErrorImageLabel->hide();
-    m_Controls->m_NoSelectedImageLabel->show();
-    UpdateInterface();
+    bool usegpu = false;
+    bool useray = false;
+    bool usemip = false;
+    selectedNode->GetBoolProperty("volumerendering.usegpu", usegpu);
+    selectedNode->GetBoolProperty("volumerendering.useray", useray);
+    selectedNode->GetBoolProperty("volumerendering.usemip", usemip);
+
+    int blendMode;
+    if (selectedNode->GetIntProperty("volumerendering.blendmode", blendMode))
+      m_Controls->blendMode->setCurrentIndex(blendMode);
+
+    if (usemip)
+      m_Controls->blendMode->setCurrentIndex(vtkVolumeMapper::MAXIMUM_INTENSITY_BLEND);
+
+    int mode = DEFAULT_RENDERMODE;
+
+    if (useray)
+      mode = RAYCAST_RENDERMODE;
+    else if (usegpu)
+      mode = GPU_RENDERMODE;
+
+    m_Controls->renderMode->setCurrentIndex(mode);
   }
+
+  m_Controls->transferFunctionWidget->SetDataNode(selectedNode);
+  m_Controls->transferFunctionWidget->setEnabled(true);
+  m_Controls->transferFunctionGeneratorWidget->SetDataNode(selectedNode);
+  m_Controls->transferFunctionGeneratorWidget->setEnabled(true);
 }
diff --git a/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.h b/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.h
index 2041f1ddc3..5d413576f2 100755
--- a/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.h
+++ b/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationView.h
@@ -1,78 +1,61 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
-#ifndef QMITKVOLUMEVISUALIZATIONVIEW_H_
-#define QMITKVOLUMEVISUALIZATIONVIEW_H_
+#ifndef QMITKVOLUMEVISUALIZATIONVIEW_H
+#define QMITKVOLUMEVISUALIZATIONVIEW_H
 
-#include <QmitkAbstractView.h>
-
-#include <mitkDataNodeSelection.h>
+#include "ui_QmitkVolumeVisualizationViewControls.h"
 
+// mitk core
+#include <mitkDataStorage.h>
 #include <mitkWeakPointer.h>
 
-#include <mitkImage.h>
-
-#include "mitkDataStorage.h"
-
-#include <QmitkDataStorageListModel.h>
-#include <QmitkDataStorageComboBox.h>
-#include <QmitkTransferFunctionWidget.h>
-
-#include "ui_QmitkVolumeVisualizationViewControls.h"
+#include <QmitkAbstractView.h>
 
 /**
- * \ingroup org_mitk_gui_qt_volumevisualization_internal
+ * @brief
  */
 class QmitkVolumeVisualizationView : public QmitkAbstractView
 {
   Q_OBJECT
 
 public:
 
-  void SetFocus() override;
+  static const std::string VIEW_ID;
 
   QmitkVolumeVisualizationView();
 
-  ~QmitkVolumeVisualizationView() override;
-
-  void CreateQtPartControl(QWidget *parent) override;
-
-  ///
-  /// Invoked when the DataManager selection changed
-  ///
-  void OnSelectionChanged(berry::IWorkbenchPart::Pointer, const QList<mitk::DataNode::Pointer>& nodes) override;
-
-  static const std::string VIEW_ID;
+  ~QmitkVolumeVisualizationView() override = default;
 
+  void SetFocus() override;
 
-protected slots:
+private Q_SLOTS:
 
-  void OnMitkInternalPreset( int mode );
+  void OnCurrentSelectionChanged(QList<mitk::DataNode::Pointer> nodes);
 
-  void OnEnableRendering( bool state );
-  void OnRenderMode( int mode );
+  void OnMitkInternalPreset(int mode);
+  void OnEnableRendering(bool state);
+  void OnRenderMode(int mode);
   void OnBlendMode(int mode);
 
-protected:
-
-  Ui::QmitkVolumeVisualizationViewControls* m_Controls;
-
 private:
 
-  mitk::WeakPointer<mitk::DataNode> m_SelectedNode;
+  void CreateQtPartControl(QWidget* parent) override;
 
   void UpdateInterface();
-  void NodeRemoved(const mitk::DataNode* node) override;
+
+  Ui::QmitkVolumeVisualizationViewControls* m_Controls;
+  mitk::WeakPointer<mitk::DataNode> m_SelectedNode;
 
 };
 
-#endif /*QMITKVOLUMEVISUALIZATIONVIEW_H_*/
+#endif // QMITKVOLUMEVISUALIZATIONVIEW_H
diff --git a/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationViewControls.ui b/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationViewControls.ui
index 2a0476f821..94fd15064f 100644
--- a/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/QmitkVolumeVisualizationViewControls.ui
@@ -1,327 +1,128 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkVolumeVisualizationViewControls</class>
  <widget class="QWidget" name="QmitkVolumeVisualizationViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>324</width>
-    <height>679</height>
+    <width>300</width>
+    <height>600</height>
    </rect>
   </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="windowTitle">
-   <string>QmitkTemplate</string>
+   <string>Volume visualization</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="m_ErrorImageLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="palette">
-      <palette>
-       <active>
-        <colorrole role="WindowText">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>191</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Text">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>191</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="ButtonText">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>191</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </active>
-       <inactive>
-        <colorrole role="WindowText">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>191</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Text">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>191</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="ButtonText">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>191</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </inactive>
-       <disabled>
-        <colorrole role="WindowText">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>120</red>
-           <green>120</green>
-           <blue>120</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Text">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>120</red>
-           <green>120</green>
-           <blue>120</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="ButtonText">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>120</red>
-           <green>120</green>
-           <blue>120</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </disabled>
-      </palette>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="m_NoSelectedImageLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="palette">
-      <palette>
-       <active>
-        <colorrole role="WindowText">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>197</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Text">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>191</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="ButtonText">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>189</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </active>
-       <inactive>
-        <colorrole role="WindowText">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>197</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Text">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>191</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="ButtonText">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>189</red>
-           <green>0</green>
-           <blue>0</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </inactive>
-       <disabled>
-        <colorrole role="WindowText">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>120</red>
-           <green>120</green>
-           <blue>120</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="Text">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>120</red>
-           <green>120</green>
-           <blue>120</blue>
-          </color>
-         </brush>
-        </colorrole>
-        <colorrole role="ButtonText">
-         <brush brushstyle="SolidPattern">
-          <color alpha="255">
-           <red>120</red>
-           <green>120</green>
-           <blue>120</blue>
-          </color>
-         </brush>
-        </colorrole>
-       </disabled>
-      </palette>
-     </property>
-     <property name="text">
-      <string>Please select a volume image!</string>
-     </property>
-    </widget>
-   </item>
+  <layout class="QVBoxLayout">
    <item>
-    <widget class="QLabel" name="m_SelectedImageLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
+   <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="volumeSelectionLabel">
+       <property name="text">
+        <string>Selected image:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QmitkSingleNodeSelectionWidget" name="volumeSelectionWidget" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>40</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+	</layout>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="QCheckBox" name="m_EnableRenderingCB">
+      <widget class="QCheckBox" name="enableRenderingCB">
        <property name="toolTip">
-        <string>Click this checkbox to enable volumerendering in the 3D view of the selected image.</string>
+        <string>Click this checkbox to enable volumerendering in the 3D view of the selected image</string>
        </property>
        <property name="text">
         <string>Volumerendering</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="m_RenderMode">
+      <widget class="QComboBox" name="renderMode">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>1</verstretch>
         </sizepolicy>
        </property>
        <property name="toolTip">
         <string>Select render mode</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="m_BlendMode"/>
+      <widget class="QComboBox" name="blendMode"/>
      </item>
     </layout>
    </item>
    <item>
-    <widget class="QmitkTransferFunctionGeneratorWidget" name="m_TransferFunctionGeneratorWidget" native="true">
+    <widget class="QmitkTransferFunctionGeneratorWidget" name="transferFunctionGeneratorWidget" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
      <property name="minimumSize">
       <size>
        <width>0</width>
        <height>0</height>
       </size>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QmitkTransferFunctionWidget" name="m_TransferFunctionWidget" native="true">
+    <widget class="QmitkTransferFunctionWidget" name="transferFunctionWidget" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>1</verstretch>
       </sizepolicy>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
+  <customwidget>
+   <class>QmitkSingleNodeSelectionWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">QmitkSingleNodeSelectionWidget.h</header>
+  </customwidget>
   <customwidget>
    <class>QmitkTransferFunctionWidget</class>
    <extends>QWidget</extends>
    <header location="global">QmitkTransferFunctionWidget.h</header>
   </customwidget>
   <customwidget>
    <class>QmitkTransferFunctionGeneratorWidget</class>
    <extends>QWidget</extends>
    <header location="global">QmitkTransferFunctionGeneratorWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
- <includes>
-  <include location="local">QmitkDataStorageComboBox.h</include>
- </includes>
  <resources/>
  <connections/>
 </ui>
diff --git a/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/mitkPluginActivator.cpp b/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/mitkPluginActivator.cpp
index 8e814351be..b6a3dddb5c 100644
--- a/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/mitkPluginActivator.cpp
+++ b/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/mitkPluginActivator.cpp
@@ -1,28 +1,27 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 #include "mitkPluginActivator.h"
 #include "QmitkVolumeVisualizationView.h"
 
-namespace mitk {
-
-void PluginActivator::start(ctkPluginContext* context)
-{
-  BERRY_REGISTER_EXTENSION_CLASS(QmitkVolumeVisualizationView, context)
-}
-
-void PluginActivator::stop(ctkPluginContext* context)
+namespace mitk
 {
-  Q_UNUSED(context)
-}
-
+  void PluginActivator::start(ctkPluginContext* context)
+  {
+    BERRY_REGISTER_EXTENSION_CLASS(QmitkVolumeVisualizationView, context)
+  }
+
+  void PluginActivator::stop(ctkPluginContext* context)
+  {
+    Q_UNUSED(context)
+  }
 }
diff --git a/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/mitkPluginActivator.h b/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/mitkPluginActivator.h
index 15a70aa6fc..c0eb58c5f8 100644
--- a/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/mitkPluginActivator.h
+++ b/Plugins/org.mitk.gui.qt.volumevisualization/src/internal/mitkPluginActivator.h
@@ -1,35 +1,34 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
+
 #ifndef MITKPLUGINACTIVATOR_H
 #define MITKPLUGINACTIVATOR_H
 
 #include <ctkPluginActivator.h>
 
-namespace mitk {
-
-class PluginActivator :
-  public QObject, public ctkPluginActivator
+namespace mitk
 {
-  Q_OBJECT
-  Q_PLUGIN_METADATA(IID "org_mitk_gui_qt_volumevisualization")
-  Q_INTERFACES(ctkPluginActivator)
-
-public:
+  class PluginActivator : public QObject, public ctkPluginActivator
+  {
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org_mitk_gui_qt_volumevisualization")
+    Q_INTERFACES(ctkPluginActivator)
 
-  void start(ctkPluginContext* context) override;
-  void stop(ctkPluginContext* context) override;
+  public:
 
-}; // PluginActivator
+    void start(ctkPluginContext* context) override;
+    void stop(ctkPluginContext* context) override;
 
+  };
 }
 
 #endif // MITKPLUGINACTIVATOR_H