diff --git a/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/ViewBrowserView.cpp b/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/ViewBrowserView.cpp
index 04d274aff4..bfe3231dc0 100644
--- a/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/ViewBrowserView.cpp
+++ b/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/ViewBrowserView.cpp
@@ -1,207 +1,197 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 
 // Blueberry
 #include <berryISelectionService.h>
 #include <berryIWorkbenchWindow.h>
 #include <berryIPerspectiveRegistry.h>
 #include <berryPlatformUI.h>
 #include <berryIWorkbenchPage.h>
 
 // Qmitk
 #include "ViewBrowserView.h"
 #include <src/internal/mitkQtPerspectiveItem.h>
 #include <src/internal/mitkQtViewItem.h>
 
 // Qt
 #include <QMessageBox>
 #include <QTreeView>
 #include <QStandardItem>
 
 
 const std::string ViewBrowserView::VIEW_ID = "org.mitk.views.viewbrowser";
 
 void ViewBrowserView::SetFocus()
 {
-    m_Controls.buttonPerformImageProcessing->setFocus();
 }
 
 void ViewBrowserView::CreateQtPartControl( QWidget *parent )
 {
-    // create GUI widgets from the Qt Designer's .ui file
+    std::map<std::string, berry::IViewDescriptor::Pointer> viewMap;
+
+    berry::IViewRegistry* viewRegistry = berry::PlatformUI::GetWorkbench()->GetViewRegistry();
+    std::vector<berry::IViewDescriptor::Pointer> views(viewRegistry->GetViews());
+    for (unsigned int i=0; i<views.size(); i++)
+    {
+      viewMap[views[i]->GetId()] = views[i];
+    }
+
+
+
+  // create GUI widgets from the Qt Designer's .ui file
     m_Controls.setupUi( parent );
-    connect( m_Controls.buttonPerformImageProcessing, SIGNAL(clicked()), this, SLOT(DoSomething()) );
     connect( m_Controls.m_PluginTreeView, SIGNAL(customContextMenuRequested(QPoint)), SLOT(CustomMenuRequested(QPoint)));
     connect( m_Controls.m_PluginTreeView, SIGNAL(clicked(const QModelIndex&)), SLOT(ItemClicked(const QModelIndex&)));
 
     m_TreeModel = new QStandardItemModel();
     QStandardItem *item = m_TreeModel->invisibleRootItem();
 
     berry::IPerspectiveRegistry* perspRegistry = berry::PlatformUI::GetWorkbench()->GetPerspectiveRegistry();
     std::vector<berry::IPerspectiveDescriptor::Pointer> perspectives(perspRegistry->GetPerspectives());
     bool skip = false;
 
-    berry::IViewRegistry* viewRegistry = berry::PlatformUI::GetWorkbench()->GetViewRegistry();
-    std::vector<berry::IViewDescriptor::Pointer> views(viewRegistry->GetViews());
-
     berry::IWorkbenchWindow::Pointer curWin = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow();
     std::string currentPersp = "";
     if (curWin.IsNotNull())
     {
       if (curWin->GetActivePage().IsNotNull())
       {
         berry::IPerspectiveDescriptor::Pointer persps = curWin->GetActivePage()->GetPerspective();
         currentPersp=persps->GetId();
       }
     }
     MITK_INFO << "PERSPECTIVES";
     for (unsigned int i=0; i<perspectives.size(); i++)
     {
         berry::IPerspectiveDescriptor::Pointer p = perspectives.at(i);
         QList< QStandardItem*> preparedRow;
         mitk::QtPerspectiveItem* pItem = new mitk::QtPerspectiveItem(QString::fromStdString(p->GetLabel()));
         pItem->m_Perspective = p;
         preparedRow << pItem;
         item->appendRow(preparedRow);
         if (currentPersp.compare(p->GetId())==0)
         {
           if (curWin.IsNull())
             continue;
           berry::IWorkbenchPage::Pointer activePage = curWin->GetActivePage();
           std::vector< std::string > currentViews = activePage->GetShowViewShortcuts();
           MITK_INFO << "Views: " << currentViews.size();
           for (int j = 0; j < currentViews.size(); ++j)
           {
-            MITK_INFO << currentViews[j];
             QList<QStandardItem *> secondRow;
 
-            mitk::QtViewItem* vItem = new mitk::QtViewItem(QString::fromStdString(v->GetLabel()));
-            vItem->m_View = v;
+            mitk::QtViewItem* vItem = new mitk::QtViewItem(QString::fromStdString(currentViews[j]));
+            vItem->m_View = viewMap[currentViews[j]];
             secondRow << vItem;
             preparedRow.first()->appendRow(secondRow);
           }
         }
 
         // if perspectiveExcludeList is set, it contains the id-strings of perspectives, which
         // should not appear as an menu-entry in the perspective menu
         //        if (perspectiveExcludeList.size() > 0)
         //        {
         //            for (unsigned int i=0; i<perspectiveExcludeList.size(); i++)
         //            {
         //                if (perspectiveExcludeList.at(i) == (*perspIt)->GetId())
         //                {
         //                    skip = true;
         //                    break;
         //                }
         //            }
         //            if (skip)
         //            {
         //                skip = false;
         //                continue;
         //            }
         //        }
 
         //        QAction* perspAction = new berry::QtOpenPerspectiveAction(window,
         //                                                                  *perspIt, perspGroup);
         //        mapPerspIdToAction.insert(std::make_pair((*perspIt)->GetId(), perspAction));
     }
 
 
     //berry::QTOpenPers
 
 
     // adding a row to the invisible root item produces a root element
     //item->appendRow(preparedRow);
 
     //QList<QStandardItem *> secondRow =prepareRow("111", "222", "333");
     // adding a row to an item starts a subtree
     //preparedRow.first()->appendRow(secondRow);
 
             //QList<QStandardItem *> preparedRow =prepareRow("first", "second", "third");
-    QList<QStandardItem *> preparedRow;
-    preparedRow << new QStandardItem(QString::fromStdString("All Views"));
-    preparedRow << new QStandardItem(QString::fromStdString(""));
-    item->appendRow(preparedRow);
-
-    for (unsigned int i=0; i<views.size(); i++)
-    {
-        berry::IViewDescriptor::Pointer w = views.at(i);
-        QList<QStandardItem *> secondRow;
-        secondRow << new QStandardItem(QString::fromStdString(w->GetLabel()));
-        secondRow << new QStandardItem(QString::fromStdString(w->GetId()));
-        preparedRow.first()->appendRow(secondRow);
-    }
 
 
     m_Controls.m_PluginTreeView->setModel(m_TreeModel);
 //    m_Controls.m_PluginTreeView->expandAll();
 }
 
 void ViewBrowserView::OnSelectionChanged( berry::IWorkbenchPart::Pointer /*source*/, const QList<mitk::DataNode::Pointer>& nodes )
 {
     // iterate all selected objects, adjust warning visibility
     foreach( mitk::DataNode::Pointer node, nodes )
     {
         if( node.IsNotNull() )
         {
             return;
         }
     }
 }
 
 void ViewBrowserView::ItemClicked(const QModelIndex &index)
 {
     QStandardItem* item = m_TreeModel->itemFromIndex(index);
     if ( dynamic_cast< mitk::QtPerspectiveItem* >(item) )
     {
         try
         {
 //            berry::IWorkbenchPage::Pointer page = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage();
 //            page->CloseAllPerspectives(false, false);
             mitk::QtPerspectiveItem* pItem = dynamic_cast< mitk::QtPerspectiveItem* >(item);
 //            page->ClosePerspective( pItem->m_Perspective, true, false );
             berry::PlatformUI::GetWorkbench()->ShowPerspective( pItem->m_Perspective->GetId(), berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow() );
         }
         catch (...)
         {
             QMessageBox::critical(0, "Opening Perspective Failed", QString("The requested perspective could not be opened.\nSee the log for details."));
         }
     }
     else if ( dynamic_cast< mitk::QtViewItem* >(item) )
     {
         berry::IWorkbenchPage::Pointer page = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage();
 
         if (page.IsNotNull())
         {
             try
             {
                 mitk::QtViewItem* vItem = dynamic_cast< mitk::QtViewItem* >(item);
                 page->ShowView(vItem->m_View->GetId());
             }
             catch (berry::PartInitException e)
             {
                 BERRY_ERROR << "Error: " << e.displayText() << std::endl;
             }
         }
     }
-
 }
-    }
 void ViewBrowserView::CustomMenuRequested(QPoint pos)
 {
     //    m_ContextMenu->popup(m_Controls.m_PerspectiveTree->viewport()->mapToGlobal(pos));
-}
+}
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/mitkQtPerspectiveItem.h b/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/mitkQtPerspectiveItem.h
index 3f6ed38bb7..69c19aa9da 100644
--- a/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/mitkQtPerspectiveItem.h
+++ b/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/mitkQtPerspectiveItem.h
@@ -1,38 +1,43 @@
 /*===================================================================
 
 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 _PerspectiveItem
 #define _PerspectiveItem
 
 #include <QStandardItem>
 #include <berryPlatformUI.h>
 
 namespace mitk
 {
 
 class QtPerspectiveItem : public QStandardItem
 {
 public:
+    QtPerspectiveItem(QString string) :
+      QStandardItem(string)
+    {
+    }
+
     using QStandardItem::QStandardItem;
     berry::IPerspectiveDescriptor::Pointer m_Perspective;
 
 private:
 
 };
 
 }
 
 #endif
diff --git a/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/mitkQtViewItem.h b/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/mitkQtViewItem.h
index 1a342c7c9c..c830af37f2 100644
--- a/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/mitkQtViewItem.h
+++ b/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/mitkQtViewItem.h
@@ -1,39 +1,43 @@
 /*===================================================================
 
 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 _ViewItem
 #define _ViewItem
 
 #include <QStandardItem>
 #include <berryPlatformUI.h>
 
 namespace mitk
 {
 
 class QtViewItem : public QStandardItem
 {
 public:
+    QtViewItem(QString string) :
+      QStandardItem(string)
+    {
+    }
     using QStandardItem::QStandardItem;
     berry::IViewDescriptor::Pointer m_View;
 
 private:
 
 
 };
 
 }
 
 #endif