diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewNavigatorWidget.cpp b/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewNavigatorWidget.cpp
index e1173133a1..2f9eeecc08 100644
--- a/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewNavigatorWidget.cpp
+++ b/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewNavigatorWidget.cpp
@@ -1,770 +1,775 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 //Qmitk headers
 #include "QmitkViewNavigatorWidget.h"
 
 // Blueberry
 #include <berryISelectionService.h>
 #include <berryIWorkbenchWindow.h>
 #include <berryIPerspectiveRegistry.h>
 #include <berryPlatformUI.h>
 #include <berryIWorkbenchPage.h>
 
 #include <berryIExtensionPointService.h>
 
 // Qt
 #include <QMessageBox>
 #include <QTreeView>
 #include <QStandardItem>
 #include <QSortFilterProxyModel>
 
 class KeywordRegistry
 {
 public:
     KeywordRegistry()
     {
         berry::IExtensionPointService::Pointer extensionPointService = berry::Platform::GetExtensionPointService();
         berry::IConfigurationElement::vector keywordExts(extensionPointService->GetConfigurationElementsFor("org.blueberry.ui.keywords"));
 
         std::string keywordId;
         std::string keywordLabels;
         berry::IConfigurationElement::vector::iterator keywordExtsIt;
         for (keywordExtsIt = keywordExts.begin(); keywordExtsIt != keywordExts.end(); ++keywordExtsIt)
         {
             (*keywordExtsIt)->GetAttribute("id", keywordId);
             (*keywordExtsIt)->GetAttribute("label", keywordLabels);
 
             if (m_Keywords.find(keywordId) == m_Keywords.end())
             {
                 m_Keywords[keywordId] = std::vector<QString>();
             }
             m_Keywords[keywordId].push_back(QString::fromStdString(keywordLabels));
         }
     }
 
     std::vector<QString> GetKeywords(const std::string& id)
     {
         return m_Keywords[id];
     }
 
     std::vector<QString> GetKeywords(const std::vector<std::string>& ids)
     {
         std::vector<QString> result;
         for (unsigned int i = 0; i < ids.size(); ++i)
         {
             std::vector< QString > tmpResult;
             tmpResult = this->GetKeywords(ids[i]);
             result.insert(result.end(), tmpResult.begin(), tmpResult.end());
         }
         return result;
     }
 
 private:
     std::map<std::string, std::vector<QString> > m_Keywords;
 };
 
 
 class ClassFilterProxyModel : public QSortFilterProxyModel
 {
 private :
     bool hasToBeDisplayed(const QModelIndex index) const;
     bool displayElement(const QModelIndex index) const;
 public:
     ClassFilterProxyModel(QObject *parent = NULL);
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
 };
 ClassFilterProxyModel::ClassFilterProxyModel(QObject *parent):
     QSortFilterProxyModel(parent)
 {
 }
 
 bool ClassFilterProxyModel::filterAcceptsRow(int sourceRow,
                                              const QModelIndex &sourceParent) const
 {
     QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
 
     return hasToBeDisplayed(index);
 }
 
 bool ClassFilterProxyModel::displayElement(const QModelIndex index) const
 {
     bool result = false;
     QString type = sourceModel()->data(index, Qt::DisplayRole).toString();
     QStandardItem * item = dynamic_cast<QStandardItemModel*>(sourceModel())->itemFromIndex(index);
 
     if (type.contains(filterRegExp()))
     {
         return true;
     }
     {
         mitk::QtViewItem* viewItem = dynamic_cast<mitk::QtViewItem*>(item);
         if (viewItem)
         {
             for (unsigned int i = 0; i < viewItem->m_Tags.size(); ++i)
             {
                 if (viewItem->m_Tags[i].contains(filterRegExp()))
                 {
                     return true;
                 }
             }
             if (viewItem->m_Description.contains(filterRegExp()))
             {
                 return true;
             }
         }
     }
     {
         mitk::QtPerspectiveItem* viewItem = dynamic_cast<mitk::QtPerspectiveItem*>(item);
         if (viewItem)
         {
             for (unsigned int i = 0; i < viewItem->m_Tags.size(); ++i)
             {
                 if (viewItem->m_Tags[i].contains(filterRegExp()))
                 {
                     return true;
                 }
             }
             if (viewItem->m_Description.contains(filterRegExp()))
             {
                 return true;
             }
         }
     }
 
     return result;
 }
 
 bool ClassFilterProxyModel::hasToBeDisplayed(const QModelIndex index) const
 {
     bool result = false;
     if ( sourceModel()->rowCount(index) > 0 )
     {
         for( int ii = 0; ii < sourceModel()->rowCount(index); ii++)
         {
             QModelIndex childIndex = sourceModel()->index(ii,0,index);
             if ( ! childIndex.isValid() )
                 break;
             result = hasToBeDisplayed(childIndex);
             result |= displayElement(index);
             if (result)
             {
                 break;
             }
         }
     }
     else
     {
         result = displayElement(index);
     }
     return result;
 }
 
 class ViewNavigatorPerspectiveListener: public berry::IPerspectiveListener
 {
 public:
 
     ViewNavigatorPerspectiveListener(QmitkViewNavigatorWidget* p) :
         parentWidget(p)
     {
     }
 
     Events::Types GetPerspectiveEventTypes() const
     {
         return Events::ACTIVATED | Events::SAVED_AS | Events::DEACTIVATED
                 // remove the following line when command framework is finished
                 | Events::CLOSED | Events::OPENED | Events::PART_CHANGED;
     }
 
     void PerspectiveActivated(berry::IWorkbenchPage::Pointer /*page*/,
                               berry::IPerspectiveDescriptor::Pointer /*perspective*/)
     {
         parentWidget->UpdateTreeList();
     }
 
     void PerspectiveSavedAs(berry::IWorkbenchPage::Pointer /*page*/,
                             berry::IPerspectiveDescriptor::Pointer /*oldPerspective*/,
                             berry::IPerspectiveDescriptor::Pointer /*newPerspective*/)
     {
 
     }
 
     void PerspectiveDeactivated(berry::IWorkbenchPage::Pointer /*page*/,
                                 berry::IPerspectiveDescriptor::Pointer /*perspective*/)
     {
         parentWidget->UpdateTreeList();
     }
 
     void PerspectiveOpened(berry::IWorkbenchPage::Pointer /*page*/,
                            berry::IPerspectiveDescriptor::Pointer /*perspective*/)
     {
         parentWidget->UpdateTreeList();
     }
 
     void PerspectiveClosed(berry::IWorkbenchPage::Pointer /*page*/,
                            berry::IPerspectiveDescriptor::Pointer /*perspective*/)
     {
         parentWidget->UpdateTreeList();
     }
 
     void PerspectiveChanged(berry::IWorkbenchPage::Pointer,
                             berry::IPerspectiveDescriptor::Pointer,
                             berry::IWorkbenchPartReference::Pointer partRef, const std::string& changeId)
     {
         if (changeId=="viewHide" && partRef->GetId()=="org.mitk.views.viewnavigatorview")
             berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->RemovePerspectiveListener(parentWidget->m_PerspectiveListener);
         else
             parentWidget->UpdateTreeList(NULL, partRef.GetPointer(), changeId);
     }
 
 private:
     QmitkViewNavigatorWidget* parentWidget;
 };
 
 struct ViewNavigatorWindowListener : public berry::IWindowListener
 {
     ViewNavigatorWindowListener(QmitkViewNavigatorWidget* switcher)
         : switcher(switcher)
         , m_Done(false)
     {}
 
     virtual void WindowOpened(berry::IWorkbenchWindow::Pointer window)
     {
         if (m_Done)
             return;
         if ( switcher->FillTreeList() )
         {
             m_Done = true;
             switcher->m_PerspectiveListener = ViewNavigatorPerspectiveListener::Pointer(new ViewNavigatorPerspectiveListener(switcher));
             window->AddPerspectiveListener(switcher->m_PerspectiveListener);
         }
     }
 
     virtual void WindowActivated(berry::IWorkbenchWindow::Pointer window)
     {
         if (m_Done)
             return;
         if ( switcher->FillTreeList() )
         {
             m_Done = true;
             switcher->m_PerspectiveListener = ViewNavigatorPerspectiveListener::Pointer(new ViewNavigatorPerspectiveListener(switcher));
             window->AddPerspectiveListener(switcher->m_PerspectiveListener);
         }
     }
 
 private:
     QmitkViewNavigatorWidget* switcher;
     bool m_Done;
 };
 
 bool compareViews(berry::IViewDescriptor::Pointer a, berry::IViewDescriptor::Pointer b)
 {
     if (a.IsNull() || b.IsNull())
         return false;
     return a->GetLabel().compare(b->GetLabel()) < 0;
 }
 
 bool comparePerspectives(berry::IPerspectiveDescriptor::Pointer a, berry::IPerspectiveDescriptor::Pointer b)
 {
     if (a.IsNull() || b.IsNull())
         return false;
     return a->GetLabel().compare(b->GetLabel()) < 0;
 }
 
 bool compareQStandardItems(QStandardItem* a, QStandardItem* b)
 {
     if (a==NULL || b==NULL)
         return false;
     return a->text().compare(b->text()) < 0;
 }
 
 QmitkViewNavigatorWidget::QmitkViewNavigatorWidget( QWidget * parent, Qt::WindowFlags )
     : QWidget(parent)
 {
     this->CreateQtPartControl(this);
 }
 
 QmitkViewNavigatorWidget::~QmitkViewNavigatorWidget()
 {
 
 }
 
+void QmitkViewNavigatorWidget::setFocus()
+{
+  m_Controls.lineEdit->setFocus();
+}
+
 void QmitkViewNavigatorWidget::CreateQtPartControl( QWidget *parent )
 {
     // create GUI widgets from the Qt Designer's .ui file
     if (berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow().IsNotNull())
     {
         m_PerspectiveListener = ViewNavigatorPerspectiveListener::Pointer(new ViewNavigatorPerspectiveListener(this));
         berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->AddPerspectiveListener(m_PerspectiveListener);
     }
     else
     {
         m_WindowListener = ViewNavigatorWindowListener::Pointer(new ViewNavigatorWindowListener(this));
         berry::PlatformUI::GetWorkbench()->AddWindowListener(m_WindowListener);
     }
 
     m_Parent = parent;
     m_Controls.setupUi( parent );
     connect( m_Controls.m_PluginTreeView, SIGNAL(customContextMenuRequested(QPoint)), SLOT(CustomMenuRequested(QPoint)));
     connect( m_Controls.m_PluginTreeView, SIGNAL(doubleClicked(const QModelIndex&)), SLOT(ItemClicked(const QModelIndex&)));
     connect( m_Controls.lineEdit, SIGNAL(textChanged(QString)), SLOT(FilterChanged()));
 
     m_ContextMenu = new QMenu(m_Controls.m_PluginTreeView);
     m_Controls.m_PluginTreeView->setContextMenuPolicy(Qt::CustomContextMenu);
 
     // Create a new TreeModel for the data
     m_TreeModel = new QStandardItemModel();
     m_FilterProxyModel = new ClassFilterProxyModel(this);
     m_FilterProxyModel->setSourceModel(m_TreeModel);
     //proxyModel->setFilterFixedString("Diff");
     m_Controls.m_PluginTreeView->setModel(m_FilterProxyModel);
     FillTreeList();
 }
 
 void QmitkViewNavigatorWidget::UpdateTreeList(QStandardItem* root, berry::IWorkbenchPartReference *partRef, const std::string &changeId)
 {
     berry::IWorkbenchPage::Pointer page = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage();
     if (page.IsNull())
         return;
 
     if (root==NULL)
         root = m_TreeModel->invisibleRootItem();
     for (int i=0; i<root->rowCount(); i++)
     {
         QStandardItem* item = root->child(i);
         QFont font;
         if (dynamic_cast<mitk::QtPerspectiveItem*>(item))
         {
             mitk::QtPerspectiveItem* pItem = dynamic_cast<mitk::QtPerspectiveItem*>(item);
             berry::IPerspectiveDescriptor::Pointer currentPersp = page->GetPerspective();
 
             if (currentPersp.IsNotNull() && currentPersp->GetId()==pItem->m_Perspective->GetId())
                 font.setBold(true);
             pItem->setFont(font);
         }
         mitk::QtViewItem* vItem = dynamic_cast<mitk::QtViewItem*>(item);
         if (vItem)
         {
             std::vector<berry::IViewPart::Pointer> viewParts(page->GetViews());
             for (unsigned int i=0; i<viewParts.size(); i++)
                 if(viewParts[i]->GetPartName()==vItem->m_View->GetLabel())
                 {
                     font.setBold(true);
                     break;
                 }
 
             if( partRef!=NULL && partRef->GetId()==vItem->m_View->GetId() && changeId=="viewHide")
                 font.setBold(false);
 
             vItem->setFont(font);
         }
         UpdateTreeList(item, partRef, changeId);
     }
 }
 
 bool QmitkViewNavigatorWidget::FillTreeList()
 {
     // active workbench window available?
     if (berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow().IsNull())
         return false;
 
     // active page available?
     berry::IWorkbenchPage::Pointer page = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage();
     if (page.IsNull())
         return false;
 
     // everything is fine and we can remove the window listener
     if (m_WindowListener.IsNotNull())
         berry::PlatformUI::GetWorkbench()->RemoveWindowListener(m_WindowListener);
 
     // initialize tree model
     m_TreeModel->clear();
     QStandardItem *treeRootItem = m_TreeModel->invisibleRootItem();
 
     // get all available perspectives
     berry::IPerspectiveRegistry* perspRegistry = berry::PlatformUI::GetWorkbench()->GetPerspectiveRegistry();
     std::vector<berry::IPerspectiveDescriptor::Pointer> perspectiveDescriptors(perspRegistry->GetPerspectives());
     std::sort(perspectiveDescriptors.begin(), perspectiveDescriptors.end(), comparePerspectives);
 
     // get all Keywords
     KeywordRegistry keywordRegistry;
 
     berry::IPerspectiveDescriptor::Pointer currentPersp = page->GetPerspective();
     std::vector<std::string> perspectiveExcludeList = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetPerspectiveExcludeList();
 
     std::vector< QStandardItem* > categoryItems;
     QStandardItem *perspectiveRootItem = new QStandardItem("Workflows");
     perspectiveRootItem->setEditable(false);
     treeRootItem->appendRow(perspectiveRootItem);
     for (unsigned int i=0; i<perspectiveDescriptors.size(); i++)
     {
         berry::IPerspectiveDescriptor::Pointer p = perspectiveDescriptors.at(i);
 
         bool skipPerspective = false;
         for(unsigned int e=0; e<perspectiveExcludeList.size(); e++)
             if(perspectiveExcludeList.at(e)==p->GetId())
             {
                 skipPerspective = true;
                 break;
             }
         if (skipPerspective)
             continue;
 
         //QIcon* pIcon = static_cast<QIcon*>(p->GetImageDescriptor()->CreateImage());
         mitk::QtPerspectiveItem* pItem = new mitk::QtPerspectiveItem(QString::fromStdString(p->GetLabel()));
         pItem->m_Perspective = p;
         pItem->m_Description = QString::fromStdString(p->GetDescription());
         std::vector<std::string> keylist = p->GetKeywordReferences();
         pItem->m_Tags = keywordRegistry.GetKeywords(keylist);
         pItem->setEditable(false);
 
         QFont font; font.setBold(true);
         if (currentPersp.IsNotNull() && currentPersp->GetId()==p->GetId())
             pItem->setFont(font);
 
         std::vector<std::string> catPath = p->GetCategoryPath();
         if (catPath.empty())
         {
             perspectiveRootItem->appendRow(pItem);
         }
         else
         {
             QStandardItem* categoryItem = NULL;
 
             for (unsigned int c=0; c<categoryItems.size(); c++)
                 if (categoryItems.at(c)->text().toStdString() == catPath.front())
                 {
                     categoryItem = categoryItems.at(c);
                     break;
                 }
 
             if (categoryItem==NULL)
             {
                 categoryItem  = new QStandardItem(QIcon(),catPath.front().c_str());
                 categoryItems.push_back(categoryItem);
             }
             categoryItem->setEditable(false);
             categoryItem->appendRow(pItem);
         }
     }
     std::sort(categoryItems.begin(), categoryItems.end(), compareQStandardItems);
     for (unsigned int i=0; i<categoryItems.size(); i++)
         perspectiveRootItem->appendRow(categoryItems.at(i));
 
     // get all available views
     berry::IViewRegistry* viewRegistry = berry::PlatformUI::GetWorkbench()->GetViewRegistry();
     std::vector<berry::IViewDescriptor::Pointer> viewDescriptors(viewRegistry->GetViews());
     std::vector<berry::IViewPart::Pointer> viewParts(page->GetViews());
     std::sort(viewDescriptors.begin(), viewDescriptors.end(), compareViews);
 
     std::vector<std::string> viewExcludeList = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetViewExcludeList();
     QStandardItem* viewRootItem = new QStandardItem(QIcon(),"Views");
     viewRootItem->setEditable(false);
     treeRootItem->appendRow(viewRootItem);
 
     categoryItems.clear();
     QStandardItem* noCategoryItem = new QStandardItem(QIcon(),"Miscellaneous");
     noCategoryItem->setEditable(false);
 
     for (unsigned int i = 0; i < viewDescriptors.size(); ++i)
     {
         berry::IViewDescriptor::Pointer v = viewDescriptors[i];
         bool skipView = false;
         for(unsigned int e=0; e<viewExcludeList.size(); e++)
             if(viewExcludeList.at(e)==v->GetId())
             {
                 skipView = true;
                 break;
             }
         if (skipView)
             continue;
 
         std::vector<std::string> catPath = v->GetCategoryPath();
 
         QIcon* icon = static_cast<QIcon*>(v->GetImageDescriptor()->CreateImage());
         mitk::QtViewItem* vItem = new mitk::QtViewItem(*icon, QString::fromStdString(v->GetLabel()));
         vItem->m_View = v;
         vItem->setToolTip(v->GetDescription().c_str());
         vItem->m_Description = QString::fromStdString(v->GetDescription());
 
         std::vector<std::string> keylist = v->GetKeywordReferences();
         vItem->m_Tags = keywordRegistry.GetKeywords(keylist);
         vItem->setEditable(false);
 
         for (unsigned int i=0; i<viewParts.size(); i++)
             if(viewParts[i]->GetPartName()==v->GetLabel())
             {
                 QFont font; font.setBold(true);
                 vItem->setFont(font);
                 break;
             }
 
         if (catPath.empty())
             noCategoryItem->appendRow(vItem);
         else
         {
             QStandardItem* categoryItem = NULL;
 
             for (unsigned int c=0; c<categoryItems.size(); c++)
                 if (categoryItems.at(c)->text().toStdString() == catPath.front())
                 {
                     categoryItem = categoryItems.at(c);
                     break;
                 }
 
             if (categoryItem==NULL)
             {
                 categoryItem  = new QStandardItem(QIcon(),catPath.front().c_str());
                 categoryItems.push_back(categoryItem);
             }
             categoryItem->setEditable(false);
             categoryItem->appendRow(vItem);
         }
     }
     std::sort(categoryItems.begin(), categoryItems.end(), compareQStandardItems);
 
     for (unsigned int i=0; i<categoryItems.size(); i++)
         viewRootItem->appendRow(categoryItems.at(i));
     if (noCategoryItem->hasChildren())
         viewRootItem->appendRow(noCategoryItem);
 
     m_Controls.m_PluginTreeView->expandAll();
 
     return true;
 }
 
 void QmitkViewNavigatorWidget::FilterChanged()
 {
     QString filterString = m_Controls.lineEdit->text();
     if (filterString.size() > 0 )
         m_Controls.m_PluginTreeView->expandAll();
     else
         m_Controls.m_PluginTreeView->collapseAll();
     //    QRegExp::PatternSyntax syntax = QRegExp::RegExp;
 
     Qt::CaseSensitivity caseSensitivity = Qt::CaseInsensitive;
     QString strPattern = "^*" + filterString;
     QRegExp regExp(strPattern, caseSensitivity);
 
     m_FilterProxyModel->setFilterRegExp(regExp);
 }
 
 void QmitkViewNavigatorWidget::ItemClicked(const QModelIndex &index)
 {
     QStandardItem* item = m_TreeModel->itemFromIndex(m_FilterProxyModel->mapToSource(index));
 
     if ( dynamic_cast< mitk::QtPerspectiveItem* >(item) )
     {
         try
         {
             mitk::QtPerspectiveItem* pItem = dynamic_cast< mitk::QtPerspectiveItem* >(item);
             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 QmitkViewNavigatorWidget::AddPerspective()
 {
     QmitkNewPerspectiveDialog* dialog = new QmitkNewPerspectiveDialog( m_Parent );
 
     int dialogReturnValue = dialog->exec();
     if ( dialogReturnValue == QDialog::Rejected )
         return;
 
     berry::IPerspectiveRegistry* perspRegistry = berry::PlatformUI::GetWorkbench()->GetPerspectiveRegistry();
     try
     {
         berry::IPerspectiveDescriptor::Pointer perspDesc;
         perspDesc = perspRegistry->CreatePerspective(dialog->GetPerspectiveName().toStdString(), perspRegistry->FindPerspectiveWithId(perspRegistry->GetDefaultPerspective()));
         berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->SetPerspective(perspDesc);
     }
     catch(...)
     {
         QMessageBox::warning(m_Parent, "Error", "Duplication of selected perspective failed. Please make sure the specified perspective name is not already in use!");
     }
     FillTreeList();
 }
 
 void QmitkViewNavigatorWidget::ClonePerspective()
 {
     if (m_RegisteredPerspective.IsNotNull())
     {
         QmitkNewPerspectiveDialog* dialog = new QmitkNewPerspectiveDialog( m_Parent );
         QString defaultName(m_RegisteredPerspective->GetLabel().c_str());
         defaultName.append(" Copy");
         dialog->SetPerspectiveName(defaultName);
 
         int dialogReturnValue = dialog->exec();
         if ( dialogReturnValue == QDialog::Rejected )
             return;
 
         berry::IPerspectiveRegistry* perspRegistry = berry::PlatformUI::GetWorkbench()->GetPerspectiveRegistry();
         try
         {
             berry::IPerspectiveDescriptor::Pointer perspDesc = perspRegistry->ClonePerspective(dialog->GetPerspectiveName().toStdString(), dialog->GetPerspectiveName().toStdString(), m_RegisteredPerspective);
             berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->SetPerspective(perspDesc);
         }
         catch(...)
         {
             QMessageBox::warning(m_Parent, "Error", "Duplication of selected perspective failed. Please make sure the specified perspective name is not already in use!");
         }
         FillTreeList();
     }
 }
 
 void QmitkViewNavigatorWidget::ResetPerspective()
 {
     if (QMessageBox::Yes == QMessageBox(QMessageBox::Question, "Please confirm", "Do you really want to reset the curent perspective?", QMessageBox::Yes|QMessageBox::No).exec())
         berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->ResetPerspective();
 }
 
 void QmitkViewNavigatorWidget::DeletePerspective()
 {
     if (m_RegisteredPerspective.IsNotNull())
     {
         QString question = "Do you really want to remove the perspective '";
         question.append(m_RegisteredPerspective->GetLabel().c_str());
         question.append("'?");
         if (QMessageBox::Yes == QMessageBox(QMessageBox::Question, "Please confirm", question, QMessageBox::Yes|QMessageBox::No).exec())
         {
             berry::IPerspectiveRegistry* perspRegistry = berry::PlatformUI::GetWorkbench()->GetPerspectiveRegistry();
             perspRegistry->DeletePerspective(m_RegisteredPerspective);
             berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->RemovePerspective(m_RegisteredPerspective);
             FillTreeList();
             if (! berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->GetPerspective())
             {
                 berry::IPerspectiveDescriptor::Pointer persp = perspRegistry->FindPerspectiveWithId(perspRegistry->GetDefaultPerspective());
                 berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage()->SetPerspective(persp);
             }
         }
     }
 }
 
 void QmitkViewNavigatorWidget::ClosePerspective()
 {
     if (QMessageBox::Yes == QMessageBox(QMessageBox::Question, "Please confirm", "Do you really want to close the curent perspective?", QMessageBox::Yes|QMessageBox::No).exec())
     {
         berry::IWorkbenchPage::Pointer page = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage();
         page->CloseCurrentPerspective(true, true);
 
         //        if ( page->GetPerspective().IsNull() )
         //        {
         //            berry::IPerspectiveRegistry* perspRegistry = berry::PlatformUI::GetWorkbench()->GetPerspectiveRegistry();
         //            berry::PlatformUI::GetWorkbench()->ShowPerspective( perspRegistry->GetDefaultPerspective(), berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow() );
         //        }
     }
 }
 
 void QmitkViewNavigatorWidget::CloseAllPerspectives()
 {
     if (QMessageBox::Yes == QMessageBox(QMessageBox::Question, "Please confirm", "Do you really want to close all perspectives?", QMessageBox::Yes|QMessageBox::No).exec())
     {
         berry::IWorkbenchPage::Pointer page = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage();
         page->CloseAllPerspectives(true, true);
 
         //        berry::IPerspectiveRegistry* perspRegistry = berry::PlatformUI::GetWorkbench()->GetPerspectiveRegistry();
         //        berry::PlatformUI::GetWorkbench()->ShowPerspective( perspRegistry->GetDefaultPerspective(), berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow() );
     }
 }
 
 void QmitkViewNavigatorWidget::ExpandAll()
 {
     m_Controls.m_PluginTreeView->expandAll();
 }
 
 void QmitkViewNavigatorWidget::CollapseAll()
 {
     m_Controls.m_PluginTreeView->collapseAll();
 }
 
 void QmitkViewNavigatorWidget::CustomMenuRequested(QPoint pos)
 {
     QModelIndex index = m_Controls.m_PluginTreeView->indexAt(pos);
     QStandardItem* item = m_TreeModel->itemFromIndex(m_FilterProxyModel->mapToSource(index));
 
     if (m_ContextMenu==NULL)
         return;
 
     m_ContextMenu->clear();
     m_RegisteredPerspective = NULL;
 
     QAction* expandAction = new QAction("Expand tree", this);
     m_ContextMenu->addAction(expandAction);
     connect(expandAction, SIGNAL(triggered()), SLOT(ExpandAll()));
 
     QAction* collapseAction = new QAction("Collapse tree", this);
     m_ContextMenu->addAction(collapseAction);
     connect(collapseAction, SIGNAL(triggered()), SLOT(CollapseAll()));
 
     m_ContextMenu->addSeparator();
 
     if ( item!=NULL && dynamic_cast< mitk::QtPerspectiveItem* >(item) )
     {
         m_RegisteredPerspective = dynamic_cast< mitk::QtPerspectiveItem* >(item)->m_Perspective;
 
         //m_ContextMenu->addSeparator();
 
         QAction* cloneAction = new QAction("Duplicate perspective", this);
         m_ContextMenu->addAction(cloneAction);
         connect(cloneAction, SIGNAL(triggered()), SLOT(ClonePerspective()));
 
         if (!m_RegisteredPerspective->IsPredefined())
         {
             QAction* deleteAction = new QAction("Remove perspective", this);
             m_ContextMenu->addAction(deleteAction);
             connect(deleteAction, SIGNAL(triggered()), SLOT(DeletePerspective()));
         }
 
         m_ContextMenu->addSeparator();
     }
 
     QAction* resetAction = new QAction("Reset current perspective", this);
     m_ContextMenu->addAction(resetAction);
     connect(resetAction, SIGNAL(triggered()), SLOT(ResetPerspective()));
 
     QAction* closeAction = new QAction("Close current perspective", this);
     m_ContextMenu->addAction(closeAction);
     connect(closeAction, SIGNAL(triggered()), SLOT(ClosePerspective()));
 
     m_ContextMenu->addSeparator();
 
     QAction* closeAllAction = new QAction("Close all perspectives", this);
     m_ContextMenu->addAction(closeAllAction);
     connect(closeAllAction, SIGNAL(triggered()), SLOT(CloseAllPerspectives()));
 
     m_ContextMenu->popup(m_Controls.m_PluginTreeView->viewport()->mapToGlobal(pos));
 }
diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewNavigatorWidget.h b/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewNavigatorWidget.h
index 5be4beb710..28bd51727e 100644
--- a/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewNavigatorWidget.h
+++ b/Plugins/org.mitk.gui.qt.viewnavigator/src/QmitkViewNavigatorWidget.h
@@ -1,89 +1,90 @@
 /*===================================================================
 
 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 _QMITKViewNavigatorWidget_H_INCLUDED
 #define _QMITKViewNavigatorWidget_H_INCLUDED
 
 //QT headers
 #include <QWidget>
 #include <QString>
 
 #include <ctkSearchBox.h>
 #include "ui_QmitkViewNavigatorWidgetControls.h"
 
 #include <berryISelectionListener.h>
 #include <berryIPerspectiveListener.h>
 #include <berryIWorkbench.h>
 #include <berryIWorkbenchPage.h>
 #include <berryIPerspectiveDescriptor.h>
 #include <QStandardItemModel>
 #include <QSortFilterProxyModel>
 #include <QMenu>
 #include <QmitkNewPerspectiveDialog.h>
 #include <mitkQtPerspectiveItem.h>
 #include <mitkQtViewItem.h>
 
 class ClassFilterProxyModel;
 
 /** @brief
   */
 class QmitkViewNavigatorWidget : public QWidget
 {
     //this is needed for all Qt objects that should have a MOC object (everything that derives from QObject)
     Q_OBJECT
 
 public:
 
     QmitkViewNavigatorWidget (QWidget* parent = 0, Qt::WindowFlags f = 0);
     virtual ~QmitkViewNavigatorWidget();
 
     virtual void CreateQtPartControl(QWidget *parent);
+    void setFocus();
 
     bool FillTreeList();
     void UpdateTreeList(QStandardItem* item = NULL, berry::IWorkbenchPartReference* partRef=NULL, const std::string& changeId="");
 
     berry::IPerspectiveListener::Pointer    m_PerspectiveListener;
     berry::IWindowListener::Pointer         m_WindowListener;
 
 public slots:
 
     void CustomMenuRequested(QPoint pos);
     void ItemClicked(const QModelIndex &index);
     void AddPerspective();
     void ClonePerspective();
     void ResetPerspective();
     void DeletePerspective();
     void CloseAllPerspectives();
     void ClosePerspective();
     void ExpandAll();
     void CollapseAll();
     void FilterChanged();
 
 protected:
 
     // member variables
     Ui::QmitkViewNavigatorWidgetControls          m_Controls;
     QWidget*                                    m_Parent;
     QStandardItemModel*                         m_TreeModel;
     ClassFilterProxyModel*                      m_FilterProxyModel;
     QMenu*                                      m_ContextMenu;
     berry::IPerspectiveDescriptor::Pointer      m_RegisteredPerspective;
 
 private:
 
 };
 
 #endif // _QMITKViewNavigatorWidget_H_INCLUDED
 
diff --git a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/ViewNavigatorView.cpp b/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/ViewNavigatorView.cpp
index e06bd3b682..f2255bdfbc 100644
--- a/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/ViewNavigatorView.cpp
+++ b/Plugins/org.mitk.gui.qt.viewnavigator/src/internal/ViewNavigatorView.cpp
@@ -1,57 +1,49 @@
 /*===================================================================
 
 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>
 
 // Qmitk
 #include "ViewNavigatorView.h"
 
 // Qt
 #include <QMessageBox>
 
 //mitk image
 #include <mitkImage.h>
 
 const std::string ViewNavigatorView::VIEW_ID = "org.mitk.views.viewnavigatorview";
 
 void ViewNavigatorView::SetFocus()
 {
-
+  m_Controls.widget->setFocus();
 }
 
 void ViewNavigatorView::CreateQtPartControl( QWidget *parent )
 {
   // create GUI widgets from the Qt Designer's .ui file
   m_Controls.setupUi( parent );
 
-
-
-//  candyStore = new QDockWidget("Candy Store");
-//  candyStore->setWidget(new QmitkViewNavigatorWidget());
-//  candyStore->setFeatures(QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable);
-//  candyStore->setVisible(false);
-//  candyStore->setObjectName("Candy Store");
-//  mainWindow->addDockWidget(Qt::LeftDockWidgetArea, candyStore);
 }
 
 void ViewNavigatorView::OnSelectionChanged( berry::IWorkbenchPart::Pointer /*source*/,
                                              const QList<mitk::DataNode::Pointer>& nodes )
 {
 
 }