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 d349cb00a3..417dc6a21e 100644
--- a/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/ViewBrowserView.cpp
+++ b/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/ViewBrowserView.cpp
@@ -1,470 +1,594 @@
 /*===================================================================
 
 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>
 #include <src/internal/QmitkNewPerspectiveDialog.h>
 
 // Qt
 #include <QMessageBox>
 #include <QTreeView>
 #include <QStandardItem>
+#include <qsortfilterproxymodel>
 
-static void OpenAllPerspectives()
+class ClassFilterProxyModel : public QSortFilterProxyModel
 {
-    berry::IWorkbenchWindow::Pointer window = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow();
+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)
+{
+}
 
-    if (window.IsNull())
-        return;
+bool ClassFilterProxyModel::filterAcceptsRow(int sourceRow,
+                                             const QModelIndex &sourceParent) const
+{
+  QModelIndex index = sourceModel()->index(sourceRow, 0, sourceParent);
+
+  return hasToBeDisplayed(index);
+}
 
-    berry::IWorkbenchPage::Pointer page = window->GetActivePage();
+bool ClassFilterProxyModel::displayElement(const QModelIndex index) const
+{
+  bool result;
+  QString type = sourceModel()->data(index, Qt::DisplayRole).toString();
+  if ( ! type.contains(filterRegExp()))
+  {
+    result = false;
+  }
+  else
+  {
+    result = true;
+  }
+  return result;
+}
+
+
+bool ClassFilterProxyModel::hasToBeDisplayed(const QModelIndex index) const
+{
+  bool result = false;
+  // How many child this element have
+  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)
+      {
+        // there is atless one element to display
+        break;
+      }
+    }
+  }
+  else
+  {
+    result = displayElement(index);
+  }
+  return result;
+}
+
+static bool OpenAllPerspectives()
+{
+  if (berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow().IsNull())
+  {
+    return false;
+  }
     if (page.IsNull())
     {
         return;
     }
 
     berry::IPerspectiveDescriptor::Pointer currentPersp = page->GetPerspective();
 
     berry::IPerspectiveRegistry* perspRegistry = berry::PlatformUI::GetWorkbench()->GetPerspectiveRegistry();
     std::vector<berry::IPerspectiveDescriptor::Pointer> perspectives(perspRegistry->GetPerspectives());
     for (unsigned int i=0; i<perspectives.size(); i++)
         berry::PlatformUI::GetWorkbench()->ShowPerspective( perspectives.at(i)->GetId(), berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow() );
 
     //FillTreeList();
     berry::PlatformUI::GetWorkbench()->ShowPerspective( currentPersp->GetId(), berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow() );
+  return true;
 }
 
 struct ViewBrowserViewListener : public berry::IPerspectiveListener
 {
     ViewBrowserViewListener(ViewBrowserView* switcher)
         : switcher(switcher),
           m_FirstRun(false),
           m_Running(false)
     {}
 
     Events::Types GetPerspectiveEventTypes() const
     {
         return Events::ACTIVATED;
     }
 
     void PerspectiveActivated(berry::IWorkbenchPage::Pointer /*page*/,
                               berry::IPerspectiveDescriptor::Pointer perspective)
     {
         if (m_Running)
         {
             return;
         }
         m_Running = true;
         if (!m_FirstRun)
         {
             OpenAllPerspectives();
             m_FirstRun = true;
         }
         switcher->FillTreeList();
         m_Running = false;
     }
 
 private:
     ViewBrowserView* switcher;
     bool m_FirstRun;
     bool m_Running;
 };
 
+struct ViewBrowserWindowListener : public berry::IWindowListener
+{
+    ViewBrowserWindowListener(ViewBrowserView* switcher)
+        : switcher(switcher),
+          m_Running(false)
+    {}
+
+    virtual void WindowOpened(berry::IWorkbenchWindow::Pointer /*window*/)
+    {
+      if (m_Running)
+      {
+        return;
+      }
+      m_Running = true;
+      if (OpenAllPerspectives())
+      {
+          switcher->RemoveListener();
+      }
+      switcher->FillTreeList();
+      m_Running = false;
+    }
+
+private:
+    ViewBrowserView* switcher;
+    bool m_Running;
+};
+
+
+
+
 const std::string ViewBrowserView::VIEW_ID = "org.mitk.views.viewbrowser";
 
 bool compareViews(berry::IViewDescriptor::Pointer a, berry::IViewDescriptor::Pointer b)
 {
     if (a.IsNull() || b.IsNull())
         return false;
     return a->GetLabel().compare(b->GetLabel()) < 0;
 }
 
 void ViewBrowserView::SetFocus()
 {
 }
 
 void ViewBrowserView::CreateQtPartControl( QWidget *parent )
 {
     // create GUI widgets from the Qt Designer's .ui file
     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.pushButton, SIGNAL(clicked()), SLOT(ButtonClicked()) );
+    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_Controls.m_PluginTreeView->setModel(m_TreeModel);
-    OpenAllPerspectives();
-    FillTreeList();
-
-    this->perspListener = new ViewBrowserViewListener(this);
+    m_FilterProxyModel = new ClassFilterProxyModel(this);
+    m_FilterProxyModel->setSourceModel(m_TreeModel);
+    //proxyModel->setFilterFixedString("Diff");
+    m_Controls.m_PluginTreeView->setModel(m_FilterProxyModel);
+    if (OpenAllPerspectives())
+    {
+      FillTreeList();
+    }
+    else
+    {
+      this->perspListener2 = new ViewBrowserWindowListener(this);
+      berry::PlatformUI::GetWorkbench()->AddWindowListener(perspListener2);
+    }
+    //this->perspListener = new ViewBrowserViewListener(this);
     //berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->AddPerspectiveListener(this->perspListener);
 }
 
 void ViewBrowserView::ButtonClicked()
 {
     berry::IWorkbenchPage::Pointer page = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage();
     berry::IPerspectiveDescriptor::Pointer currentPersp = page->GetPerspective();
 
     berry::IPerspectiveRegistry* perspRegistry = berry::PlatformUI::GetWorkbench()->GetPerspectiveRegistry();
     std::vector<berry::IPerspectiveDescriptor::Pointer> perspectives(perspRegistry->GetPerspectives());
     for (unsigned int i=0; i<perspectives.size(); i++)
         berry::PlatformUI::GetWorkbench()->ShowPerspective( perspectives.at(i)->GetId(), berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow() );
 
     FillTreeList();
     berry::PlatformUI::GetWorkbench()->ShowPerspective( currentPersp->GetId(), berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow() );
 }
 
+void ViewBrowserView::RemoveListener()
+{
+  berry::PlatformUI::GetWorkbench()->RemoveWindowListener(perspListener2);
+}
+
 void ViewBrowserView::FillTreeList()
 {
     m_TreeModel->clear();
     QStandardItem *treeRootItem = m_TreeModel->invisibleRootItem();
 
     // Get all available views and create a map of all views
     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];
     }
     std::sort(views.begin(), views.end(), compareViews);
 
     // Get all available perspectives
     berry::IPerspectiveRegistry* perspRegistry = berry::PlatformUI::GetWorkbench()->GetPerspectiveRegistry();
     std::vector<berry::IPerspectiveDescriptor::Pointer> perspectives(perspRegistry->GetPerspectives());
 
     // workbench window available?
     if (berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow().IsNull())
         return;
 
+//    berry::PlatformUI::GetWorkbench()->AddWindowListener();
+
     // Fill the TreeModel
     berry::IWorkbenchPage::Pointer page = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetActivePage();
     if (page.IsNull())
     {
         return;
     }
     QModelIndex currentIndex;
     berry::IPerspectiveDescriptor::Pointer currentPersp = page->GetPerspective();
     std::vector<std::string> perspectiveExcludeList = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetPerspectiveExcludeList();
     std::vector<std::string> viewExcludeList = berry::PlatformUI::GetWorkbench()->GetActiveWorkbenchWindow()->GetViewExcludeList();
 
     QStandardItem *perspectiveRootItem = new QStandardItem("Perspectives");
     treeRootItem->appendRow(perspectiveRootItem);
     for (unsigned int i=0; i<perspectives.size(); i++)
     {
         berry::IPerspectiveDescriptor::Pointer p = perspectives.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;
 
         QList< QStandardItem*> preparedRow;
 
         QIcon* pIcon = static_cast<QIcon*>(p->GetImageDescriptor()->CreateImage());
         mitk::QtPerspectiveItem* pItem = new mitk::QtPerspectiveItem(*pIcon, QString::fromStdString(p->GetLabel()));
         pItem->m_Perspective = p;
         preparedRow << pItem;
         perspectiveRootItem->appendRow(preparedRow);
 
         if (currentPersp->GetId()==p->GetId())
             currentIndex = pItem->index();
 
         for (unsigned int i = 0; i < views.size(); ++i)
         {
             bool skipView = false;
             for(unsigned int e=0; e<viewExcludeList.size(); e++)
                 if(viewExcludeList.at(e)==views.at(i)->GetId())
                 {
                     skipView = true;
                     break;
                 }
             if (skipView)
                 continue;
 
             if ( page->HasView(p->GetId(), views.at(i)->GetId()) )
             {
                 QList<QStandardItem *> secondRow;
                 QIcon* vIcon = static_cast<QIcon*>(views[i]->GetImageDescriptor()->CreateImage());
                 mitk::QtViewItem* vItem = new mitk::QtViewItem(*vIcon, QString::fromStdString(views[i]->GetLabel()));
                 vItem->m_View = views[i];
                 secondRow << vItem;
                 preparedRow.first()->appendRow(secondRow);
             }
         }
 
         //        // If the current perspective is the active perspective add current views
         //        if (currentPersp.compare(p->GetId())==0)
         //        {
         //            if (curWin.IsNull())
         //                continue;
 
         //            berry::IWorkbenchPage::Pointer activePage = curWin->GetActivePage();
         //            std::vector< std::string > currentViews = activePage->GetShowViewShortcuts();
         //            // Create a vector with all current elements
         //            std::vector<berry::IViewDescriptor::Pointer> activeViews;
         //            for (int j = 0; j < currentViews.size(); ++j)
         //            {
         //                berry::IViewDescriptor::Pointer view = viewMap[currentViews[j]];
         //                if (view.IsNull())
         //                    continue;
         //                activeViews.push_back(view);
         //            }
         //            std::sort(activeViews.begin(), activeViews.end(), compareViews);
 
 
         //            for (int j = 0; j < activeViews.size(); ++j)
         //            {
         //                berry::IViewDescriptor::Pointer view =activeViews[j];
         //                QList<QStandardItem *> secondRow;
         //                QIcon* icon = static_cast<QIcon*>(view->GetImageDescriptor()->CreateImage());
         //                mitk::QtViewItem* vItem = new mitk::QtViewItem(*icon,QString::fromStdString(view->GetLabel()));
         //                vItem->m_View = view;
         //                secondRow << vItem;
         //                preparedRow.first()->appendRow(secondRow);
         //            }
         //        }
     }
 
     // Add a list with all available views
     QList< QStandardItem*> preparedRow;
     QStandardItem* pItem = new QStandardItem(QIcon(),"Views");
     preparedRow << pItem;
     treeRootItem->appendRow(preparedRow);
     for (unsigned int i = 0; i < views.size(); ++i)
     {
         QList<QStandardItem *> secondRow;
         QIcon* icon = static_cast<QIcon*>(views[i]->GetImageDescriptor()->CreateImage());
         mitk::QtViewItem* vItem = new mitk::QtViewItem(*icon, QString::fromStdString(views[i]->GetLabel()));
         vItem->m_View = views[i];
         secondRow << vItem;
         preparedRow.first()->appendRow(secondRow);
     }
 
     m_Controls.m_PluginTreeView->setCurrentIndex(currentIndex);
 }
 
 void ViewBrowserView::OnSelectionChanged( berry::IWorkbenchPart::Pointer /*source*/, const QList<mitk::DataNode::Pointer>& nodes )
 {
 }
 
+void ViewBrowserView::FilterChanged()
+{
+  QRegExp::PatternSyntax syntax = QRegExp::RegExp;
+
+  Qt::CaseSensitivity caseSensitivity = Qt::CaseInsensitive;
+  QString strPattern = "^*" + m_Controls.lineEdit->text();
+  QRegExp regExp(strPattern, caseSensitivity);
+
+  m_FilterProxyModel->setFilterRegExp(regExp);
+}
+
 void ViewBrowserView::ItemClicked(const QModelIndex &index)
 {
-    QStandardItem* item = m_TreeModel->itemFromIndex(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 ViewBrowserView::AddPerspective()
 {
     QmitkNewPerspectiveDialog* dialog = new QmitkNewPerspectiveDialog( m_Parent );
 
     int dialogReturnValue = dialog->exec();
     if ( dialogReturnValue == QDialog::Rejected )
         return;
 
     berry::IPerspectiveRegistry* perspRegistry = berry::PlatformUI::GetWorkbench()->GetPerspectiveRegistry();
     try
     {
         perspRegistry->CreatePerspective(dialog->GetPerspectiveName().toStdString(), perspRegistry->FindPerspectiveWithId(perspRegistry->GetDefaultPerspective()));
     }
     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 ViewBrowserView::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
         {
             perspRegistry->ClonePerspective(dialog->GetPerspectiveName().toStdString(), dialog->GetPerspectiveName().toStdString(), m_RegisteredPerspective);
         }
         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 ViewBrowserView::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 ViewBrowserView::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);
             FillTreeList();
         }
     }
 }
 
 void ViewBrowserView::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 ViewBrowserView::ClosePerspectives()
 {
     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 ViewBrowserView::CustomMenuRequested(QPoint pos)
 {
     QStandardItem* item = m_TreeModel->itemFromIndex(m_Controls.m_PluginTreeView->indexAt(pos));
 
     if (m_ContextMenu==NULL || item==NULL)
         return;
 
     m_ContextMenu->clear();
     m_RegisteredPerspective = NULL;
 
     bool showMenu = false;
     if (item->text()=="Perspectives")
     {
         QAction* addAction = new QAction("Create new perspective", this);
         m_ContextMenu->addAction(addAction);
         connect(addAction, SIGNAL(triggered()), SLOT(AddPerspective()));
 
         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(ClosePerspectives()));
 
         showMenu = true;
     }
     if (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()));
         }
 
         showMenu = true;
     }
 
     if (showMenu)
         m_ContextMenu->popup(m_Controls.m_PluginTreeView->viewport()->mapToGlobal(pos));
 }
diff --git a/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/ViewBrowserView.h b/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/ViewBrowserView.h
index fa5411e8e6..e323dc217d 100644
--- a/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/ViewBrowserView.h
+++ b/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/ViewBrowserView.h
@@ -1,93 +1,100 @@
 /*===================================================================
 
 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 ViewBrowserView_h
 #define ViewBrowserView_h
 
 #include <berryISelectionListener.h>
 #include <berryIPerspectiveListener.h>
 #include <berryIWorkbench.h>
 #include <berryIWorkbenchPage.h>
 #include <berryIPerspectiveDescriptor.h>
 
 #include <QmitkAbstractView.h>
 
 #include "ui_ViewBrowserViewControls.h"
 
 #include <QStandardItemModel>
+#include <QSortFilterProxyModel>
 #include <QMenu>
 #include <src/internal/mitkQtPerspectiveItem.h>
 #include <src/internal/mitkQtViewItem.h>
 
 
 /**
   \brief ViewBrowserView
 
   \warning  This class is not yet documented. Use "git blame" and ask the author to provide basic documentation.
 
   \sa QmitkAbstractView
   \ingroup ${plugin_target}_internal
 */
+class ClassFilterProxyModel;
+
 class ViewBrowserView : 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:
 
     static const std::string VIEW_ID;
 
 
     /// \brief Fills the TreeList with the available perspectives and views.
     void FillTreeList();
+    void RemoveListener();
 
 
   protected slots:
 
     /// \brief Called when the user clicks the GUI button
     void CustomMenuRequested(QPoint pos);
     void ItemClicked(const QModelIndex &index);
     void AddPerspective();
     void ClonePerspective();
     void ResetPerspective();
     void DeletePerspective();
     void ClosePerspectives();
     void ClosePerspective();
     void ButtonClicked();
+    void FilterChanged();
 
   protected:
 
     virtual void CreateQtPartControl(QWidget *parent);
 
     virtual void SetFocus();
 
     /// \brief called by QmitkFunctionality when DataManager's selection has changed
     virtual void OnSelectionChanged( berry::IWorkbenchPart::Pointer source,
                                      const QList<mitk::DataNode::Pointer>& nodes );
 
     QWidget*                                    m_Parent;
     Ui::ViewBrowserViewControls                 m_Controls;
     QStandardItemModel*                         m_TreeModel;
+    ClassFilterProxyModel*                      m_FilterProxyModel;
     QMenu*                                      m_ContextMenu;
     berry::IPerspectiveDescriptor::Pointer      m_RegisteredPerspective;
     berry::IPerspectiveListener::Pointer        perspListener;
+    berry::IWindowListener::Pointer                perspListener2;
 
     friend struct ViewBrowserViewListener;
 };
 
 #endif // ViewBrowserView_h
diff --git a/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/ViewBrowserViewControls.ui b/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/ViewBrowserViewControls.ui
index 0169dfb5fe..e9c9e1fcb3 100644
--- a/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/ViewBrowserViewControls.ui
+++ b/Plugins/org.mitk.gui.qt.viewbrowser/src/internal/ViewBrowserViewControls.ui
@@ -1,61 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ViewBrowserViewControls</class>
  <widget class="QWidget" name="ViewBrowserViewControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>752</width>
     <height>974</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>QmitkTemplate</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLineEdit" name="lineEdit"/>
+   </item>
    <item>
     <widget class="QTreeView" name="m_PluginTreeView">
      <property name="rootIsDecorated">
       <bool>true</bool>
      </property>
      <attribute name="headerVisible">
       <bool>false</bool>
      </attribute>
     </widget>
    </item>
    <item>
     <widget class="QPushButton" name="pushButton">
      <property name="text">
       <string>PushButton</string>
      </property>
     </widget>
    </item>
-   <item>
-    <spacer name="spacer1">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>220</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources/>
  <connections/>
 </ui>