diff --git a/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsContextMenu.cpp b/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsContextMenu.cpp
index 0994613b77..c92093ad3b 100644
--- a/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsContextMenu.cpp
+++ b/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsContextMenu.cpp
@@ -1,78 +1,78 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 // semantic relations plugin
 #include "QmitkSemanticRelationsContextMenu.h"
 
 QmitkSemanticRelationsContextMenu::QmitkSemanticRelationsContextMenu(berry::IWorkbenchPartSite::Pointer workbenchPartSite, QWidget* parent)
   : QMenu(parent)
 {
   m_WorkbenchPartSite = workbenchPartSite;
   m_Parent = parent;
 
   InitDefaultActions();
 }
 
 QmitkSemanticRelationsContextMenu::~QmitkSemanticRelationsContextMenu()
 {
   // nothing here
 }
 
 void QmitkSemanticRelationsContextMenu::SetDataStorage(mitk::DataStorage* dataStorage)
 {
   if (m_DataStorage != dataStorage)
   {
     // set the new data storage - also for all actions
     m_DataStorage = dataStorage;
     m_ControlPointAction->SetDataStorage(m_DataStorage.Lock());
     m_InformationTypeAction->SetDataStorage(m_DataStorage.Lock());
     m_RemoveFromSemanticRelationsAction->SetDataStorage(m_DataStorage.Lock());
     m_UnlinkFromLesionAction->SetDataStorage(m_DataStorage.Lock());
   }
 }
 
 void QmitkSemanticRelationsContextMenu::SetControlledRenderer(RenderWindowLayerUtilities::RendererVector controlledRenderer)
 {
   if (m_ControlledRenderer != controlledRenderer)
   {
     // set the new set of controlled renderer
     m_ControlledRenderer = controlledRenderer;
     m_OpenInAction->SetControlledRenderer(m_ControlledRenderer);
   }
 }
 
 void QmitkSemanticRelationsContextMenu::OnContextMenuRequested(const QPoint& /*pos*/)
 {
   popup(QCursor::pos());
 }
 
 void QmitkSemanticRelationsContextMenu::InitDefaultActions()
 {
   m_ControlPointAction = new QmitkDataNodeSetControlPointAction(m_Parent, m_WorkbenchPartSite.Lock());
   addAction(m_ControlPointAction);
 
   m_InformationTypeAction = new QmitkDataNodeInformationTypeAction(m_Parent, m_WorkbenchPartSite.Lock());
   addAction(m_InformationTypeAction);
 
-  m_RemoveFromSemanticRelationsAction = new QmitkDataNodeRemoveFromSemanticRelationsAction(m_Parent, m_WorkbenchPartSite.Lock());
-  addAction(m_RemoveFromSemanticRelationsAction);
-
   m_UnlinkFromLesionAction = new QmitkDataNodeUnlinkFromLesionAction(m_Parent, m_WorkbenchPartSite.Lock());
   addAction(m_UnlinkFromLesionAction);
 
+  m_RemoveFromSemanticRelationsAction = new QmitkDataNodeRemoveFromSemanticRelationsAction(m_Parent, m_WorkbenchPartSite.Lock());
+  addAction(m_RemoveFromSemanticRelationsAction);
+
   m_OpenInAction = new QmitkDataNodeOpenInAction(m_Parent, m_WorkbenchPartSite.Lock());
   addAction(m_OpenInAction);
 }
diff --git a/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsContextMenu.h b/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsContextMenu.h
index 480dae7e05..fb94cef562 100644
--- a/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsContextMenu.h
+++ b/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsContextMenu.h
@@ -1,73 +1,73 @@
 /*===================================================================
 
 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 QMITKSEMANTICRELATIONSCONTEXTMENU_H
 #define QMITKSEMANTICRELATIONSCONTEXTMENU_H
 
 // semantic relations plugin
 #include "QmitkDataNodeSetControlPointAction.h"
 #include "QmitkDataNodeInformationTypeAction.h"
-#include "QmitkDataNodeRemoveFromSemanticRelationsAction.h"
 #include "QmitkDataNodeUnlinkFromLesionAction.h"
+#include "QmitkDataNodeRemoveFromSemanticRelationsAction.h"
 #include "QmitkDataNodeOpenInAction.h"
 
 // mitk core
 #include <mitkDataStorage.h>
 #include <mitkWeakPointer.h>
 
 // mitk render window manager module
 #include <mitkRenderWindowLayerUtilities.h>
 
 // blueberry ui qt plugin
 #include <berryIWorkbenchPartSite.h>
 
 //qt
 #include <QMenu>
 
 class QmitkSemanticRelationsContextMenu : public QMenu
 {
   Q_OBJECT
 
 public:
 
   QmitkSemanticRelationsContextMenu(berry::IWorkbenchPartSite::Pointer workbenchPartSite, QWidget* parent = nullptr);
   virtual ~QmitkSemanticRelationsContextMenu() override;
 
   void SetDataStorage(mitk::DataStorage* dataStorage);
   void SetControlledRenderer(RenderWindowLayerUtilities::RendererVector controlledRenderer);
 
 public Q_SLOTS:
 
   void OnContextMenuRequested(const QPoint&);
 
 private:
 
   void InitDefaultActions();
 
   QWidget* m_Parent;
   berry::IWorkbenchPartSite::WeakPtr m_WorkbenchPartSite;
   mitk::WeakPointer<mitk::DataStorage> m_DataStorage;
   RenderWindowLayerUtilities::RendererVector m_ControlledRenderer;
 
   QmitkDataNodeSetControlPointAction* m_ControlPointAction;
   QmitkDataNodeInformationTypeAction* m_InformationTypeAction;
-  QmitkDataNodeRemoveFromSemanticRelationsAction* m_RemoveFromSemanticRelationsAction;
   QmitkDataNodeUnlinkFromLesionAction* m_UnlinkFromLesionAction;
+  QmitkDataNodeRemoveFromSemanticRelationsAction* m_RemoveFromSemanticRelationsAction;
   QmitkDataNodeOpenInAction* m_OpenInAction;
 
 };
 
 #endif // QMITKSEMANTICRELATIONSCONTEXTMENU_H
diff --git a/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsView.cpp b/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsView.cpp
index 359ec4b351..1bcfa8d989 100644
--- a/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsView.cpp
+++ b/Plugins/org.mitk.gui.qt.semanticrelations/src/internal/QmitkSemanticRelationsView.cpp
@@ -1,277 +1,276 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 // semantic relations plugin
 #include "QmitkSemanticRelationsView.h"
-#include "QmitkSemanticRelationsNodeSelectionDialog.h"
 #include "QmitkDataNodeAddToSemanticRelationsAction.h"
 #include "QmitkDataNodeRemoveFromSemanticRelationsAction.h"
 
 // semantic relations module
 #include <mitkNodePredicates.h>
 #include <mitkSemanticRelationException.h>
 
 // mitk qt widgets module
 #include <QmitkDnDDataNodeWidget.h>
 #include <QmitkRenderWindow.h>
 
 // mitk multi label module
 #include <mitkLabelSetImage.h>
 
 // berry
 #include <berryISelectionService.h>
 #include <berryIWorkbenchWindow.h>
 
 // qt
 #include <QMenu>
 #include <QTreeView>
 
 const std::string QmitkSemanticRelationsView::VIEW_ID = "org.mitk.views.semanticrelations";
 
 void QmitkSemanticRelationsView::SetFocus()
 {
   // nothing here
 }
 
 void QmitkSemanticRelationsView::CreateQtPartControl(QWidget* parent)
 {
   // create GUI widgets
   m_Controls.setupUi(parent);
 
   // initialize the semantic relations
   m_SemanticRelations = std::make_unique<mitk::SemanticRelations>(GetDataStorage());
 
   m_LesionInfoWidget = new QmitkLesionInfoWidget(GetDataStorage(), parent);
   m_Controls.gridLayout->addWidget(m_LesionInfoWidget);
 
   m_PatientTableInspector = new QmitkPatientTableInspector(parent);
   m_PatientTableInspector->SetDataStorage(GetDataStorage());
   m_Controls.gridLayout->addWidget(m_PatientTableInspector);
 
   QGridLayout* dndDataNodeWidgetLayout = new QGridLayout;
   dndDataNodeWidgetLayout->addWidget(m_PatientTableInspector, 0, 0);
   dndDataNodeWidgetLayout->setContentsMargins(0, 0, 0, 0);
 
   m_DnDDataNodeWidget = new QmitkDnDDataNodeWidget(parent);
   m_DnDDataNodeWidget->setLayout(dndDataNodeWidgetLayout);
 
   m_Controls.gridLayout->addWidget(m_DnDDataNodeWidget);
 
   m_ContextMenu = new QmitkSemanticRelationsContextMenu(GetSite(), m_PatientTableInspector);
   m_ContextMenu->SetDataStorage(GetDataStorage());
 
   mitk::IRenderWindowPart* renderWindowPart = GetRenderWindowPart();
   if (nullptr != renderWindowPart)
   {
     RenderWindowPartActivated(renderWindowPart);
   }
 
   SetUpConnections();
 
   const auto& allCaseIDs = m_SemanticRelations->GetAllCaseIDs();
   for (const auto& caseID : allCaseIDs)
   {
     AddToComboBox(caseID);
   }
 }
 
 void QmitkSemanticRelationsView::RenderWindowPartActivated(mitk::IRenderWindowPart* renderWindowPart)
 {
   // connect QmitkRenderWindows - underlying vtkRenderWindow is the same as "mitk::RenderingManager::GetInstance()->GetAllRegisteredRenderWindows()"
   QHash<QString, QmitkRenderWindow*> windowMap = renderWindowPart->GetQmitkRenderWindows();
   QHash<QString, QmitkRenderWindow*>::Iterator it;
 
   mitk::BaseRenderer* baseRenderer = nullptr;
   RenderWindowLayerUtilities::RendererVector controlledRenderer;
   for (it = windowMap.begin(); it != windowMap.end(); ++it)
   {
     baseRenderer = mitk::BaseRenderer::GetInstance(it.value()->GetVtkRenderWindow());
     if (nullptr != baseRenderer)
     {
       controlledRenderer.push_back(baseRenderer);
     }
   }
 
   m_ContextMenu->SetControlledRenderer(controlledRenderer);
 }
 
 void QmitkSemanticRelationsView::RenderWindowPartDeactivated(mitk::IRenderWindowPart* renderWindowPart)
 {
   // nothing here
 }
 
 void QmitkSemanticRelationsView::SetUpConnections()
 {
   connect(m_Controls.caseIDComboBox, static_cast<void (QComboBox::*)(const QString&)>(&QComboBox::currentIndexChanged), this, &QmitkSemanticRelationsView::OnCaseIDSelectionChanged);
   connect(m_LesionInfoWidget, &QmitkLesionInfoWidget::LesionSelectionChanged, this, &QmitkSemanticRelationsView::OnLesionSelectionChanged);
   connect(m_PatientTableInspector, &QmitkPatientTableInspector::CurrentSelectionChanged, this, &QmitkSemanticRelationsView::OnDataNodeSelectionChanged);
   connect(m_PatientTableInspector, &QmitkPatientTableInspector::DataNodeDoubleClicked, this, &QmitkSemanticRelationsView::OnDataNodeDoubleClicked);
   connect(m_DnDDataNodeWidget, &QmitkDnDDataNodeWidget::NodesDropped, this, &QmitkSemanticRelationsView::OnNodesAdded);
 
   connect(m_PatientTableInspector, &QmitkPatientTableInspector::OnContextMenuRequested, m_ContextMenu, &QmitkSemanticRelationsContextMenu::OnContextMenuRequested);
   connect(m_PatientTableInspector, &QmitkPatientTableInspector::OnNodeRemoved, this, &QmitkSemanticRelationsView::NodeRemoved);
 }
 
 QItemSelectionModel* QmitkSemanticRelationsView::GetDataNodeSelectionModel() const
 {
   return m_PatientTableInspector->GetSelectionModel();
 }
 
 void QmitkSemanticRelationsView::NodeRemoved(const mitk::DataNode* dataNode)
 {
   if (nullptr == dataNode)
   {
     return;
   }
 
   if (m_SemanticRelations->InstanceExists(dataNode))
   {
     RemoveFromSemanticRelationsAction::Run(m_SemanticRelations.get(), dataNode);
     mitk::SemanticTypes::CaseID caseID = mitk::GetCaseIDFromDataNode(dataNode);
     RemoveFromComboBox(caseID);
   }
 }
 
 void QmitkSemanticRelationsView::OnLesionSelectionChanged(const mitk::SemanticTypes::Lesion& lesion)
 {
   m_PatientTableInspector->SetLesion(lesion);
 }
 
 void QmitkSemanticRelationsView::OnDataNodeSelectionChanged(const QList<mitk::DataNode::Pointer>& dataNodeSelection)
 {
   m_LesionInfoWidget->SetDataNodeSelection(dataNodeSelection);
 }
 
 void QmitkSemanticRelationsView::OnDataNodeDoubleClicked(const mitk::DataNode* dataNode)
 {
   if (nullptr == dataNode)
   {
     return;
   }
 
   if (mitk::NodePredicates::GetImagePredicate()->CheckNode(dataNode))
   {
     OpenInEditor(dataNode);
   }
   else if (mitk::NodePredicates::GetSegmentationPredicate()->CheckNode(dataNode))
   {
     JumpToPosition(dataNode);
   }
 }
 
 void QmitkSemanticRelationsView::OnCaseIDSelectionChanged(const QString& caseID)
 {
   m_LesionInfoWidget->SetCaseID(caseID.toStdString());
   m_PatientTableInspector->SetCaseID(caseID.toStdString());
 }
 
 void QmitkSemanticRelationsView::OnNodesAdded(QmitkDnDDataNodeWidget* dnDDataNodeWidget, std::vector<mitk::DataNode*> nodes)
 {
   mitk::SemanticTypes::CaseID caseID = "";
   for (mitk::DataNode* dataNode : nodes)
   {
     AddToSemanticRelationsAction::Run(m_SemanticRelations.get(), GetDataStorage(), dataNode);
     caseID = mitk::GetCaseIDFromDataNode(dataNode);
     AddToComboBox(caseID);
   }
 }
 
 void QmitkSemanticRelationsView::OnNodeRemoved(const mitk::DataNode* dataNode)
 {
   NodeRemoved(dataNode);
 }
 
 void QmitkSemanticRelationsView::AddToComboBox(const mitk::SemanticTypes::CaseID& caseID)
 {
   int foundIndex = m_Controls.caseIDComboBox->findText(QString::fromStdString(caseID));
   if (-1 == foundIndex)
   {
     // add the caseID to the combo box, as it is not already contained
     m_Controls.caseIDComboBox->addItem(QString::fromStdString(caseID));
   }
 }
 
 void QmitkSemanticRelationsView::RemoveFromComboBox(const mitk::SemanticTypes::CaseID& caseID)
 {
   std::vector<mitk::SemanticTypes::ControlPoint> allControlPoints = m_SemanticRelations->GetAllControlPointsOfCase(caseID);
   int foundIndex = m_Controls.caseIDComboBox->findText(QString::fromStdString(caseID));
   if (allControlPoints.empty() && -1 != foundIndex)
   {
     // TODO: find new way to check for empty case id
     // caseID does not contain any control points and therefore no data
     // remove the caseID, if it is still contained
     m_Controls.caseIDComboBox->removeItem(foundIndex);
   }
 }
 
 void QmitkSemanticRelationsView::OpenInEditor(const mitk::DataNode* dataNode)
 {
   auto renderWindowPart = GetRenderWindowPart();
   if (nullptr == renderWindowPart)
   {
     renderWindowPart = GetRenderWindowPart(QmitkAbstractView::BRING_TO_FRONT | QmitkAbstractView::OPEN);
     if (nullptr == renderWindowPart)
     {
       // no render window available
       return;
     }
   }
 
   auto image = dynamic_cast<mitk::Image*>(dataNode->GetData());
   if (nullptr != image)
   {
     mitk::RenderingManager::GetInstance()->InitializeViews(image->GetTimeGeometry(), mitk::RenderingManager::REQUEST_UPDATE_ALL, true);
   }
 }
 
 void QmitkSemanticRelationsView::JumpToPosition(const mitk::DataNode* dataNode)
 {
   if (nullptr == dataNode)
   {
     return;
   }
 
   mitk::LabelSetImage* labelSetImage = dynamic_cast<mitk::LabelSetImage*>(dataNode->GetData());
   if (nullptr == labelSetImage)
   {
     return;
   }
 
   int activeLayer = labelSetImage->GetActiveLayer();
   mitk::Label* activeLabel = labelSetImage->GetActiveLabel(activeLayer);
   labelSetImage->UpdateCenterOfMass(activeLabel->GetValue(), activeLayer);
   const mitk::Point3D& centerPosition = activeLabel->GetCenterOfMassCoordinates();
   if (centerPosition.GetVnlVector().max_value() > 0.0)
   {
     auto renderWindowPart = GetRenderWindowPart();
     if (nullptr == renderWindowPart)
     {
       renderWindowPart = GetRenderWindowPart(QmitkAbstractView::BRING_TO_FRONT | QmitkAbstractView::OPEN);
       if (nullptr == renderWindowPart)
       {
         // no render window available
         return;
       }
     }
 
     auto segmentation = dynamic_cast<mitk::LabelSetImage*>(dataNode->GetData());
     if (nullptr != segmentation)
     {
       renderWindowPart->SetSelectedPosition(centerPosition);
       mitk::RenderingManager::GetInstance()->InitializeViews(segmentation->GetTimeGeometry(), mitk::RenderingManager::REQUEST_UPDATE_ALL, true);
     }
   }
 }