diff --git a/Core/Code/Controllers/mitkCameraController.cpp b/Core/Code/Controllers/mitkCameraController.cpp
index 841e583321..7fd4e878c7 100644
--- a/Core/Code/Controllers/mitkCameraController.cpp
+++ b/Core/Code/Controllers/mitkCameraController.cpp
@@ -1,168 +1,170 @@
 /*=========================================================================
- 
+
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision$
- 
+
 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 "mitkCameraController.h"
 #include "mitkVtkPropRenderer.h"
 #include "mitkRenderingManager.h"
 #include <vtkRenderWindowInteractor.h>
 #include "vtkCommand.h"
 
 #include "vtkCamera.h"
 #include "vtkRenderer.h"
 
 mitk::CameraController::CameraController(const char * type) : BaseController(type), m_Renderer(NULL), m_ZoomFactor(1.0)
 {}
 
 
 mitk::CameraController::~CameraController()
 {}
 
 
 void mitk::CameraController::Resize(int, int)
 {}
 
 
 void mitk::CameraController::MousePressEvent(mitk::MouseEvent*)
 {}
 
 
 void mitk::CameraController::MouseReleaseEvent(mitk::MouseEvent*)
 {}
 
 
 void mitk::CameraController::MouseMoveEvent(mitk::MouseEvent*)
 {}
 
 
 void mitk::CameraController::KeyPressEvent(mitk::KeyEvent*)
 {}
 
 
 void mitk::CameraController::SetViewToAnterior()
 {
   this->SetStandardView(ANTERIOR);
 }
 
 
 void mitk::CameraController::SetViewToPosterior()
 {
   this->SetStandardView(POSTERIOR);
 }
 
 
 void mitk::CameraController::SetViewToSinister()
 {
   this->SetStandardView(SINISTER);
 }
 
 
 void mitk::CameraController::SetViewToDexter()
 {
   this->SetStandardView(DEXTER);
 }
 
 
 void mitk::CameraController::SetViewToCranial()
 {
   this->SetStandardView(CRANIAL);
 }
 
 
 void mitk::CameraController::SetViewToCaudal()
 {
   this->SetStandardView(CAUDAL);
 }
 
 
 void mitk::CameraController::SetStandardView( mitk::CameraController::StandardView view )
 {
   const mitk::VtkPropRenderer* glRenderer = dynamic_cast<const mitk::VtkPropRenderer*>(m_Renderer);
   if (glRenderer == NULL)
     return;
   vtkRenderer* vtkRenderer = glRenderer->GetVtkRenderer();
   assert (vtkRenderer);
 
   mitk::BoundingBox::Pointer bb;
   mitk::DataStorage* ds = m_Renderer->GetDataStorage();
   if (ds != NULL)
     bb = ds->ComputeBoundingBox();
   else
     return;
 
-  mitk::Point3D middle = bb->GetCenter();
-//  vtkRenderer->GetActiveCamera()->SetFocalPoint(middle[0], middle[1], middle[2]);
-  switch(view)
-  {
-  case ANTERIOR:
-  case POSTERIOR:
-  case SINISTER:
-  case DEXTER:
-//    vtkRenderer->GetActiveCamera()->SetViewUp(0,0,1);
-    break;
-  case CRANIAL:
-  case CAUDAL:
-//    vtkRenderer->GetActiveCamera()->SetViewUp(0,-1,0);
-    break;
-  }
-  switch(view)
-  {
-  case ANTERIOR:
-//    vtkRenderer->GetActiveCamera()->SetPosition(middle[0],-100000,middle[2]);
-    break;
-  case POSTERIOR:
-//    vtkRenderer->GetActiveCamera()->SetPosition(middle[0],+100000,middle[2]);
-    break;
-  case SINISTER:
-//    vtkRenderer->GetActiveCamera()->SetPosition(+100000,middle[1],middle[2]);
-    break;
-  case DEXTER:
-//    vtkRenderer->GetActiveCamera()->SetPosition(-100000,middle[1],middle[2]);
-    break;
-  case CRANIAL:
-//    vtkRenderer->GetActiveCamera()->SetPosition(middle[0],middle[1],100000);
-    break;
-  case CAUDAL:
-//    vtkRenderer->GetActiveCamera()->SetPosition(middle[0],middle[1],-100000);
-    break;
-  }
-//  vtkRenderer->ResetCamera();
-//  double *cameraPosition = vtkRenderer->GetActiveCamera()->GetPosition();
-  switch(view)
+  if(m_Renderer->GetRenderWindow() == m_Renderer->GetRenderWindowByName("stdmulti.widget4"))
   {
-  case ANTERIOR:
-  case POSTERIOR:
-//    vtkRenderer->GetActiveCamera()->SetPosition(cameraPosition[0],cameraPosition[1] / m_ZoomFactor,cameraPosition[2]);
-    break;
-
-  case SINISTER:
-  case DEXTER:
-//    vtkRenderer->GetActiveCamera()->SetPosition(cameraPosition[0] / m_ZoomFactor,cameraPosition[1],cameraPosition[2]);
-    break;
-
-  case CRANIAL:
-  case CAUDAL:
-//    vtkRenderer->GetActiveCamera()->SetPosition(cameraPosition[0],cameraPosition[1],cameraPosition[2] / m_ZoomFactor);
-    break;
+    //set up the view for the 3D render window. The views for 2D are set up in the mitkImageVtkMapper2D
+    mitk::Point3D middle = bb->GetCenter();
+    vtkRenderer->GetActiveCamera()->SetFocalPoint(middle[0], middle[1], middle[2]);
+    switch(view)
+    {
+    case ANTERIOR:
+    case POSTERIOR:
+    case SINISTER:
+    case DEXTER:
+      vtkRenderer->GetActiveCamera()->SetViewUp(0,0,1);
+      break;
+    case CRANIAL:
+    case CAUDAL:
+      vtkRenderer->GetActiveCamera()->SetViewUp(0,-1,0);
+      break;
+    }
+    switch(view)
+    {
+    case ANTERIOR:
+      vtkRenderer->GetActiveCamera()->SetPosition(middle[0],-100000,middle[2]);
+      break;
+    case POSTERIOR:
+      vtkRenderer->GetActiveCamera()->SetPosition(middle[0],+100000,middle[2]);
+      break;
+    case SINISTER:
+      vtkRenderer->GetActiveCamera()->SetPosition(+100000,middle[1],middle[2]);
+      break;
+    case DEXTER:
+      vtkRenderer->GetActiveCamera()->SetPosition(-100000,middle[1],middle[2]);
+      break;
+    case CRANIAL:
+      vtkRenderer->GetActiveCamera()->SetPosition(middle[0],middle[1],100000);
+      break;
+    case CAUDAL:
+      vtkRenderer->GetActiveCamera()->SetPosition(middle[0],middle[1],-100000);
+      break;
+    }
+    vtkRenderer->ResetCamera();
+    double *cameraPosition = vtkRenderer->GetActiveCamera()->GetPosition();
+    switch(view)
+    {
+    case ANTERIOR:
+    case POSTERIOR:
+      vtkRenderer->GetActiveCamera()->SetPosition(cameraPosition[0],cameraPosition[1] / m_ZoomFactor,cameraPosition[2]);
+      break;
+
+    case SINISTER:
+    case DEXTER:
+      vtkRenderer->GetActiveCamera()->SetPosition(cameraPosition[0] / m_ZoomFactor,cameraPosition[1],cameraPosition[2]);
+      break;
+
+    case CRANIAL:
+    case CAUDAL:
+      vtkRenderer->GetActiveCamera()->SetPosition(cameraPosition[0],cameraPosition[1],cameraPosition[2] / m_ZoomFactor);
+      break;
+    }
+    vtkRenderer->ResetCameraClippingRange();
   }
-//  vtkRenderer->ResetCameraClippingRange();
-  MITK_INFO << "view: " << view;
-  MITK_INFO << "mitkCameraController.cpp";
 
   mitk::RenderingManager* rm = m_Renderer->GetRenderingManager();
   rm->RequestUpdateAll();
 }