diff --git a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp
index 295b825bcb..7e12c0ee07 100644
--- a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp
+++ b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp
@@ -1,280 +1,279 @@
 /*===================================================================
 
 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 "QmitkXnatTreeBrowserView.h"
 
 // Qmitk
 #include "QmitkXnatObjectEditorInput.h"
 #include "QmitkXnatEditor.h"
 #include "org_mitk_gui_qt_xnatinterface_Activator.h"
 
 // Blueberry
 #include <berryIWorkbenchPage.h>
 #include <berryPlatform.h>
 
 // CTK XNAT Core
 #include "ctkXnatFile.h"
 
 // Qt
 #include <QDir>
 #include <QMenu>
 #include <QAction>
 
 // MITK
 #include <mitkDataStorage.h>
 #include <QmitkIOUtil.h>
 
 const std::string QmitkXnatTreeBrowserView::VIEW_ID = "org.mitk.views.xnat.treebrowser";
 
 QmitkXnatTreeBrowserView::QmitkXnatTreeBrowserView() :
 m_DataStorageServiceTracker(mitk::org_mitk_gui_qt_xnatinterface_Activator::GetContext()),
 m_TreeModel(new QmitkXnatTreeModel()),
 m_Tracker(0),
 m_DownloadPath(berry::Platform::GetPreferencesService()->GetSystemPreferences()->Node("/XnatConnection")->Get("Download Path", ""))
 {
   m_DataStorageServiceTracker.open();
 
   // Set DownloadPath
   if (m_DownloadPath.isEmpty())
   {
     QString xnatFolder = "XNAT_DOWNLOADS";
     QDir dir(mitk::org_mitk_gui_qt_xnatinterface_Activator::GetContext()->getDataFile("").absoluteFilePath());
     dir.mkdir(xnatFolder);
     dir.setPath(dir.path() + "/" + xnatFolder);
     m_DownloadPath = dir.path() + "/";
   }
 }
 
 QmitkXnatTreeBrowserView::~QmitkXnatTreeBrowserView()
 {
   delete m_TreeModel;
   delete m_Tracker;
 }
 
 void QmitkXnatTreeBrowserView::SetFocus()
 {
 }
 
 void QmitkXnatTreeBrowserView::CreateQtPartControl(QWidget *parent)
 {
   // Create GUI widgets from the Qt Designer's .ui file
   m_Controls.setupUi(parent);
   m_Controls.treeView->setModel(m_TreeModel);
   m_Controls.treeView->header()->hide();
   m_Controls.labelError->setText("Please use the 'Connect' button in the Preferences.");
   m_Controls.labelError->setStyleSheet("QLabel { color: red; }");
 
   m_SelectionProvider = new berry::QtSelectionProvider();
   this->SetSelectionProvider();
   m_Controls.treeView->setSelectionMode(QAbstractItemView::SingleSelection);
   m_Controls.treeView->setContextMenuPolicy(Qt::CustomContextMenu);
 
   m_Tracker = new mitk::XnatSessionTracker(mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext());
-  m_NodeMenu = new QMenu(m_Controls.treeView);
+
+  m_ContextMenu = new QMenu(m_Controls.treeView);
 
   connect(m_Controls.treeView, SIGNAL(customContextMenuRequested(const QPoint&)),
-    this, SLOT(NodeTableViewContextMenuRequested(const QPoint&)));
+    this, SLOT(OnContextMenuRequested(const QPoint&)));
   connect(m_Tracker, SIGNAL(AboutToBeClosed(ctkXnatSession*)), this, SLOT(CleanTreeModel(ctkXnatSession*)));
   connect(m_Tracker, SIGNAL(Opened(ctkXnatSession*)), this, SLOT(UpdateSession(ctkXnatSession*)));
 
   m_Tracker->Open();
 
   ctkXnatSession* session;
 
   try
   {
     session = mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetService(
       mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetServiceReference<ctkXnatSession>());
   }
   catch (std::invalid_argument)
   {
     session = 0;
   }
 
   if (session != 0)
   {
     m_Controls.labelError->setVisible(false);
   }
   else
   {
     m_Controls.labelError->setVisible(true);
   }
 
   connect(m_Controls.treeView, SIGNAL(activated(const QModelIndex&)), this, SLOT(OnActivatedNode(const QModelIndex&)));
 }
 
 void QmitkXnatTreeBrowserView::OnActivatedNode(const QModelIndex& index)
 {
   if (!index.isValid()) return;
 
   berry::IWorkbenchPage::Pointer page = GetSite()->GetPage();
   QmitkXnatObjectEditorInput::Pointer oPtr(new QmitkXnatObjectEditorInput(index.data(Qt::UserRole).value<ctkXnatObject*>()));
   berry::IEditorInput::Pointer editorInput(oPtr);
   berry::IEditorPart::Pointer reuseEditor = page->FindEditor(editorInput);
 
   if (reuseEditor)
   {
     // Just set it activ
     page->Activate(reuseEditor);
   }
   else
   {
     QList<berry::IEditorReference::Pointer> editors =
       page->FindEditors(berry::IEditorInput::Pointer(0), QmitkXnatEditor::EDITOR_ID, berry::IWorkbenchPage::MATCH_ID);
 
     if (editors.isEmpty())
     {
       ctkXnatFile* file = dynamic_cast<ctkXnatFile*>(oPtr->GetXnatObject());
       if (file != NULL)
       {
         // If the selected node is a file, so show it in MITK
         InternalFileDownload(index, true);
       }
       else
       {
         // No XnatEditor is currently open, create a new one
         page->OpenEditor(editorInput, QmitkXnatEditor::EDITOR_ID);
       }
     }
     else
     {
       // Reuse an existing editor
       reuseEditor = editors.front()->GetEditor(true);
       page->ReuseEditor(reuseEditor.Cast<berry::IReusableEditor>(), editorInput);
       page->Activate(reuseEditor);
     }
   }
 }
 
 void QmitkXnatTreeBrowserView::SetSelectionProvider()
 {
   GetSite()->SetSelectionProvider(m_SelectionProvider);
 }
 
 void QmitkXnatTreeBrowserView::UpdateSession(ctkXnatSession* session)
 {
   if (session != 0 && session->isOpen())
   {
     m_Controls.labelError->setVisible(false);
     // Fill model and show in the GUI
     m_TreeModel->addDataModel(session->dataModel());
     m_Controls.treeView->reset();
     m_SelectionProvider->SetItemSelectionModel(m_Controls.treeView->selectionModel());
   }
 }
 
 void QmitkXnatTreeBrowserView::CleanTreeModel(ctkXnatSession* session)
 {
   if (session != 0)
   {
     m_TreeModel->removeDataModel(session->dataModel());
     m_Controls.treeView->reset();
   }
 }
 
 void QmitkXnatTreeBrowserView::InternalFileDownload(const QModelIndex& index, bool loadData)
 {
   QVariant variant = m_TreeModel->data(index, Qt::UserRole);
   if (variant.isValid())
   {
     ctkXnatFile* file = dynamic_cast<ctkXnatFile*>(variant.value<ctkXnatObject*>());
     if (file != NULL)
     {
       QDir downDir(m_DownloadPath);
       QString filePath = m_DownloadPath + file->name();
 
       // Testing if the file exists already
       if (downDir.exists(file->name()))
       {
         MITK_INFO << "File '" << file->name().toStdString() << "' already exists!";
       }
       else
       {
         MITK_INFO << "Download started ...";
         MITK_INFO << "...";
         file->download(filePath);
 
         // Testing if the file exists now
         if (downDir.exists(file->name()))
         {
           MITK_INFO << "Download of " << file->name().toStdString() << " was completed!";
         }
         else
         {
           MITK_INFO << "Download of " << file->name().toStdString() << " failed!";
         }
       }
       if (downDir.exists(file->name()))
       {
         if (loadData)
         {
           mitk::IDataStorageService* dsService = m_DataStorageServiceTracker.getService();
           mitk::DataStorage::Pointer dataStorage = dsService->GetDataStorage()->GetDataStorage();
           QStringList list;
           list << (m_DownloadPath + file->name());
           try
           {
             QmitkIOUtil::Load(list, *dataStorage);
           }
           catch (const mitk::Exception& e)
           {
             MITK_INFO << e;
             return;
           }
           mitk::RenderingManager::GetInstance()->InitializeViewsByBoundingObjects(
             dsService->GetDataStorage()->GetDataStorage());
         }
       }
     }
     else
     {
       MITK_INFO << "Selection was not a file!";
     }
   }
 }
 
 void QmitkXnatTreeBrowserView::OnContextMenuDownloadFile()
 {
   QModelIndex index = m_Controls.treeView->currentIndex();
   InternalFileDownload(index, false);
 }
 
 void QmitkXnatTreeBrowserView::OnContextMenuDownloadAndOpenFile()
 {
   QModelIndex index = m_Controls.treeView->currentIndex();
   InternalFileDownload(index, true);
 }
 
-void QmitkXnatTreeBrowserView::NodeTableViewContextMenuRequested(const QPoint & pos)
+void QmitkXnatTreeBrowserView::OnContextMenuRequested(const QPoint & pos)
 {
-  m_NodeMenu->clear();
+  m_ContextMenu->clear();
   QModelIndex index = m_Controls.treeView->indexAt(pos);
-  QVariant variant = m_TreeModel->data(index, Qt::UserRole);
-  if (variant.isValid())
+
+  ctkXnatObject* xnatObject = m_TreeModel->xnatObject(index);
   {
-    ctkXnatFile* file = dynamic_cast<ctkXnatFile*>(variant.value<ctkXnatObject*>());
-    if (file != NULL)
     {
       QAction* actShow = new QAction("Download and Open", m_NodeMenu);
       QAction* actDownload = new QAction("Download", m_NodeMenu);
       m_NodeMenu->addAction(actShow);
       m_NodeMenu->addAction(actDownload);
       connect(actShow, SIGNAL(triggered()), this, SLOT(OnContextMenuDownloadAndOpenFile()));
       connect(actDownload, SIGNAL(triggered()), this, SLOT(OnContextMenuDownloadFile()));
       m_NodeMenu->popup(QCursor::pos());
     }
   }
 }
diff --git a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h
index 4bf29304c4..7eb75d8c8e 100644
--- a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h
+++ b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h
@@ -1,100 +1,99 @@
 /*===================================================================
 
 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 QMITKXNATTREEBROWSERVIEW_H
 #define QMITKXNATTREEBROWSERVIEW_H
 
 #include <berryQtSelectionProvider.h>
 
 #include <QmitkAbstractView.h>
 
 #include "ui_QmitkXnatTreeBrowserViewControls.h"
 
 // ctkXnatCore
 #include "ctkXnatSession.h"
 
 // ctkXnatWidget
 #include "QmitkXnatTreeModel.h"
 
 // MitkXNAT Module
 #include "mitkXnatSessionTracker.h"
 
 #include <mitkIDataStorageService.h>
 #include <ctkServiceTracker.h>
 
 class QMenu;
 
 /*!
 \brief QmitkXnatTreeBrowserView
 
 \warning This class is not yet documented. Use "git blame" and ask the author to provide basic documentation.
 
 \sa QmitkFunctionality
 \ingroup ${plugin_target}_internal
 */
 class QmitkXnatTreeBrowserView : public QmitkAbstractView
 {
   // this is needed for all Qt objects that should have a Qt meta-object
   // (everything that derives from QObject and wants to have signal/slots)
   Q_OBJECT
 
 public:
 
   QmitkXnatTreeBrowserView();
   ~QmitkXnatTreeBrowserView();
 
   static const std::string VIEW_ID;
 
   virtual void CreateQtPartControl(QWidget *parent);
 
   protected slots:
 
   /// \brief Opens or reuses the xnat editor with the activated node as root item.
   void OnActivatedNode(const QModelIndex& index);
 
   /// \brief Updates the ctkXnatSession and the user interface
   void UpdateSession(ctkXnatSession* session);
 
   /// \brief Cleans the tree model
   void CleanTreeModel(ctkXnatSession* session);
 
-  void NodeTableViewContextMenuRequested(const QPoint & pos);
-
+  void OnContextMenuRequested(const QPoint & pos);
   void OnContextMenuDownloadAndOpenFile();
   void OnContextMenuDownloadFile();
 
 protected:
 
   virtual void SetFocus();
 
   Ui::QmitkXnatTreeBrowserViewControls m_Controls;
 
 private:
 
   void InternalFileDownload(const QModelIndex& index, bool loadData);
   berry::QtSelectionProvider::Pointer m_SelectionProvider;
   void SetSelectionProvider();
 
   ctkServiceTracker<mitk::IDataStorageService*> m_DataStorageServiceTracker;
   QmitkXnatTreeModel* m_TreeModel;
 
   mitk::XnatSessionTracker* m_Tracker;
   QString m_DownloadPath;
 
-  QMenu* m_NodeMenu;
+  QMenu* m_ContextMenu;
 };
 
 #endif // QMITKXNATTREEBROWSERVIEW_H