diff --git a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.cpp b/Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.cpp
index 288715b689..5eba27d2f0 100644
--- a/Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorView.cpp
@@ -1,181 +1,176 @@
 /*=========================================================================
-
-Program:   Medical Imaging & Interaction Toolkit
-Language:  C++
-Date:      $Date$
-Version:   $Revision: 17495 $
-
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
 #include "QmitkImageNavigatorView.h"
 
 #include "mitkNodePredicateDataType.h"
 
 #include "QmitkDataStorageComboBox.h"
 #include "QmitkStdMultiWidget.h"
 
 #include "mitkDataStorageEditorInput.h"
 
 // berry Includes
 #include <berryPlatform.h>
 #include <berryIWorkbenchPage.h>
 #include <berryConstants.h>
 
 #include <QMessageBox>
 
 
 
 const std::string QmitkImageNavigatorView::VIEW_ID = "org.mitk.views.imagenavigator";
 
 
 class ImageNavigatorPartListener : public berry::IPartListener
 {
 public:
 
   ImageNavigatorPartListener(QmitkImageNavigatorView* view)
     : m_View(view)
   {}
 
   berry::IPartListener::Events::Types GetPartEventTypes() const
   {
     return berry::IPartListener::Events::OPENED |
         berry::IPartListener::Events::CLOSED;
   }
 
   void PartClosed(berry::IWorkbenchPartReference::Pointer partRef)
   {
-    m_View->SetMultiWidget(0);
+    if((partRef->GetId() == QmitkImageNavigatorView::VIEW_ID) || (partRef->GetId() == QmitkStdMultiWidgetEditor::EDITOR_ID))
+    {
+      m_View->SetMultiWidget(0);
+    }
   }
 
   void PartOpened(berry::IWorkbenchPartReference::Pointer partRef)
   {
     if (partRef->GetId() == QmitkStdMultiWidgetEditor::EDITOR_ID)
     {
-      if (partRef->GetId() == QmitkStdMultiWidgetEditor::EDITOR_ID)
+      if (QmitkStdMultiWidgetEditor::Pointer multiWidgetPart =
+          partRef->GetPart(false).Cast<QmitkStdMultiWidgetEditor>())
+      {
+        m_View->SetMultiWidget(multiWidgetPart->GetStdMultiWidget());
+      }
+      else
       {
-        if (QmitkStdMultiWidgetEditor::Pointer multiWidgetPart =
-            partRef->GetPart(false).Cast<QmitkStdMultiWidgetEditor>())
-        {
-          m_View->SetMultiWidget(multiWidgetPart->GetStdMultiWidget());
-        }
-        else
-        {
-          m_View->SetMultiWidget(0);
-        }
+        m_View->SetMultiWidget(0);
       }
     }
   }
 
 private:
 
   QmitkImageNavigatorView* m_View;
 };
 
 
 QmitkImageNavigatorView::QmitkImageNavigatorView()
-: m_MultiWidget(NULL)
+  : m_MultiWidget(NULL)
 {
   multiWidgetListener = new ImageNavigatorPartListener(this);
 }
 
 QmitkImageNavigatorView::~QmitkImageNavigatorView()
 {
   this->GetSite()->GetPage()->RemovePartListener(multiWidgetListener);
-  //delete m_TransversalStepper;
-  //delete m_SagittalStepper;
-  //delete m_FrontalStepper;
-  //delete m_TimeStepper;
 }
 
 void QmitkImageNavigatorView::CreateQtPartControl(QWidget *parent)
 {
 
   // create GUI widgets
   m_Controls.setupUi(parent);
   m_MultiWidget = this->GetActiveStdMultiWidget();
   m_Controls.m_SliceNavigatorTransversal->SetInverseDirection(true);
   m_TransversalStepper = new QmitkStepperAdapter(m_Controls.m_SliceNavigatorTransversal, m_MultiWidget->mitkWidget1->GetSliceNavigationController()->GetSlice() , "sliceNavigatorTransversalFromSimpleExample");
   m_SagittalStepper = new QmitkStepperAdapter(m_Controls.m_SliceNavigatorSagittal, m_MultiWidget->mitkWidget2->GetSliceNavigationController()->GetSlice(), "sliceNavigatorSagittalFromSimpleExample");
   m_FrontalStepper = new QmitkStepperAdapter(m_Controls.m_SliceNavigatorFrontal, m_MultiWidget->mitkWidget3->GetSliceNavigationController()->GetSlice(), "sliceNavigatorFrontalFromSimpleExample");
   m_TimeStepper = new QmitkStepperAdapter(m_Controls.m_SliceNavigatorTime, m_MultiWidget->GetTimeNavigationController()->GetTime(), "sliceNavigatorTimeFromSimpleExample");
 
   this->GetSite()->GetPage()->AddPartListener(multiWidgetListener);
 }
 
 void QmitkImageNavigatorView::SetFocus ()
 {
 
 }
 
 void QmitkImageNavigatorView::SetMultiWidget(QmitkStdMultiWidget* multiWidget)
 {
   m_MultiWidget = multiWidget;
   if (m_MultiWidget)
   {
-    m_TransversalStepper->SetStepper(m_MultiWidget->mitkWidget1->GetSliceNavigationController()->GetSlice());
-    m_SagittalStepper->SetStepper(m_MultiWidget->mitkWidget2->GetSliceNavigationController()->GetSlice());
-    m_FrontalStepper->SetStepper(m_MultiWidget->mitkWidget3->GetSliceNavigationController()->GetSlice());
-    m_TimeStepper->SetStepper(m_MultiWidget->GetTimeNavigationController()->GetTime());
+    m_TransversalStepper->deleteLater();
+    m_SagittalStepper->deleteLater();
+    m_FrontalStepper->deleteLater();
+    m_TimeStepper->deleteLater();
+
+    m_TransversalStepper = new QmitkStepperAdapter(m_Controls.m_SliceNavigatorTransversal, m_MultiWidget->mitkWidget1->GetSliceNavigationController()->GetSlice() , "sliceNavigatorTransversalFromSimpleExample");
+    m_SagittalStepper = new QmitkStepperAdapter(m_Controls.m_SliceNavigatorSagittal, m_MultiWidget->mitkWidget2->GetSliceNavigationController()->GetSlice(), "sliceNavigatorSagittalFromSimpleExample");
+    m_FrontalStepper = new QmitkStepperAdapter(m_Controls.m_SliceNavigatorFrontal, m_MultiWidget->mitkWidget3->GetSliceNavigationController()->GetSlice(), "sliceNavigatorFrontalFromSimpleExample");
+    m_TimeStepper = new QmitkStepperAdapter(m_Controls.m_SliceNavigatorTime, m_MultiWidget->GetTimeNavigationController()->GetTime(), "sliceNavigatorTimeFromSimpleExample");
   }
   else
   {
     m_TransversalStepper->SetStepper(0);
     m_SagittalStepper->SetStepper(0);
     m_FrontalStepper->SetStepper(0);
     m_TimeStepper->SetStepper(0);
   }
 }
 
 QmitkStdMultiWidget* QmitkImageNavigatorView::GetActiveStdMultiWidget()
 {
   QmitkStdMultiWidget* activeStdMultiWidget = 0;
   berry::IEditorPart::Pointer editor =
-    this->GetSite()->GetPage()->GetActiveEditor();
+      this->GetSite()->GetPage()->GetActiveEditor();
 
   if (editor.Cast<QmitkStdMultiWidgetEditor>().IsNotNull())
   {
     activeStdMultiWidget = editor.Cast<QmitkStdMultiWidgetEditor>()->GetStdMultiWidget();
   }
   else
   {
     mitk::DataStorageEditorInput::Pointer editorInput;
     editorInput = new mitk::DataStorageEditorInput();
     berry::IEditorPart::Pointer editor = this->GetSite()->GetPage()->OpenEditor(editorInput, QmitkStdMultiWidgetEditor::EDITOR_ID, false);
     activeStdMultiWidget = editor.Cast<QmitkStdMultiWidgetEditor>()->GetStdMultiWidget();
   }
 
   return activeStdMultiWidget;
 }
 
 int QmitkImageNavigatorView::GetSizeFlags(bool width)
 {
   if(!width)
   {
     return berry::Constants::MIN | berry::Constants::MAX | berry::Constants::FILL;
   }
   else
   {
     return 0;
   }
 }
 
 int QmitkImageNavigatorView::ComputePreferredSize(bool width, int /*availableParallel*/, int /*availablePerpendicular*/, int preferredResult)
 {
   if(width==false)
   {
     return 160;
   }
   else
   {
     return preferredResult;
   }
 }