diff --git a/Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorder.cpp b/Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorder.cpp
index a34e1f3d2c..60d067ac27 100644
--- a/Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorder.cpp
+++ b/Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorder.cpp
@@ -1,90 +1,110 @@
 /*===================================================================
 
 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 "InteractionEventRecorder.h"
 
 // Qt
 #include <QMessageBox>
+#include <QFileDialog>
 // us
 #include "usGetModuleContext.h"
 #include "usModuleContext.h"
 
 #include <usModuleInitialization.h>
 #include <mitkXML2EventParser.h>
 #include <vtkSmartPointer.h>
 #include "QmitkRenderWindow.h"
 
 
 US_INITIALIZE_MODULE("InteractionEventRecorder","liborg_mitk_gui_qt_eventrecorder")
 
 
 const std::string InteractionEventRecorder::VIEW_ID = "org.mitk.views.interactioneventrecorder";
 
 void InteractionEventRecorder::SetFocus()
 {
   m_Controls.textFileName->setFocus();
 }
 
 void InteractionEventRecorder::StartRecording()
 {
   MITK_INFO << "Start Recording";
   m_CurrentObserver->SetOutputFile(m_Controls.textFileName->text().toStdString());
   m_CurrentObserver->StartRecording();
 }
 
+void InteractionEventRecorder::StopRecording()
+{
+  MITK_INFO << "Stop Recording";
+  m_CurrentObserver->StopRecording();
+}
+
 void InteractionEventRecorder::Play()
 {
   std::ifstream xmlStream(m_Controls.textFileName->text().toStdString().c_str());
   mitk::XML2EventParser parser(xmlStream);
   mitk::XML2EventParser::EventContainerType events = parser.GetInteractions();
 
   MITK_INFO << "parsed events";
   for (int i=0; i < events.size(); ++i)
-    this->GetRenderWindowPart()->GetQmitkRenderWindow("sagittal")->GetRenderer()->GetDispatcher()->ProcessEvent(events.at(i));
+  {
+    events.at(i)->SetSender(this->GetRenderWindowPart()->GetQmitkRenderWindow("axial")->GetRenderer());
+    this->GetRenderWindowPart()->GetQmitkRenderWindow("axial")->GetRenderer()->GetDispatcher()->ProcessEvent(events.at(i));
+   }
   MITK_INFO << "DONE";
 
 }
 
+void InteractionEventRecorder::OpenFile()
+{
+  QString fn = QFileDialog::getOpenFileName(NULL, "Open File...",
+                                                QString(), "All Files (*)");
+      if (!fn.isEmpty())
+        this->m_Controls.textFileName->setText(fn);
+}
+
 void InteractionEventRecorder::CreateQtPartControl( QWidget *parent )
 {
   // create GUI widgets from the Qt Designer's .ui file
   m_Controls.setupUi( parent );
+  connect( m_Controls.btnStopRecording, SIGNAL(clicked()), this, SLOT(StopRecording()) );
   connect( m_Controls.btnStartRecording, SIGNAL(clicked()), this, SLOT(StartRecording()) );
   connect( m_Controls.btnPlay, SIGNAL(clicked()), this, SLOT(Play()) );
+  connect( m_Controls.btnOpenFile, SIGNAL(clicked()), this, SLOT(OpenFile()) );
 
   m_CurrentObserver = new mitk::EventRecorder();
   // Register as listener via micro services
   us::ServiceProperties props;
 
   props["name"] = std::string("EventRecorder");
   m_ServiceRegistration = us::GetModuleContext()->RegisterService<mitk::InteractionEventObserver>(m_CurrentObserver,props);
 
 
 
   /*
 
 delete m_CurrentObserverDEBUG;
   m_ServiceRegistrationDEBUG.Unregister();
   */
 }
 
 
diff --git a/Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorder.h b/Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorder.h
index 26151819b8..c360c4c394 100644
--- a/Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorder.h
+++ b/Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorder.h
@@ -1,74 +1,76 @@
 /*===================================================================
 
 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 InteractionEventRecorder_h
 #define InteractionEventRecorder_h
 
 #include <berryISelectionListener.h>
 
 #include <QmitkAbstractView.h>
 
 #include "ui_InteractionEventRecorderControls.h"
 
 #include "mitkInteractionEventObserver.h"
 #include "mitkEventRecorder.h"
 
 /**
   \brief InteractionEventRecorder
 
   Demontrates the use of InteractionOversers.
 
   Allows to record all mouse interaction in the renderwindows save it as XML file. And also replay the interaction.
 
   \sa QmitkAbstractView
   \ingroup ${plugin_target}_internal
 */
 class InteractionEventRecorder : 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;
 
   protected slots:
 
     /// \brief Called when the user clicks the GUI button
 
     void StartRecording();
+    void StopRecording();
+    void OpenFile();
     void Play();
 
   protected:
 
     virtual void CreateQtPartControl(QWidget *parent);
 
     virtual void SetFocus();
 
 
 
     Ui::InteractionEventRecorderControls m_Controls;
 
  private:
     mitk::EventRecorder* m_CurrentObserver;
 
     us::ServiceRegistration<mitk::InteractionEventObserver> m_ServiceRegistration;
 
 };
 
 #endif // InteractionEventRecorder_h
diff --git a/Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorderControls.ui b/Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorderControls.ui
index bcacecedfd..a1727d764e 100644
--- a/Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorderControls.ui
+++ b/Plugins/org.mitk.gui.qt.eventrecorder/src/internal/InteractionEventRecorderControls.ui
@@ -1,71 +1,111 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>InteractionEventRecorderControls</class>
  <widget class="QWidget" name="InteractionEventRecorderControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>222</width>
-    <height>161</height>
+    <width>253</width>
+    <height>214</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="QLabel" name="label">
      <property name="text">
       <string>Filename to store interaction</string>
      </property>
     </widget>
    </item>
    <item>
-    <widget class="QLineEdit" name="textFileName"/>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLineEdit" name="textFileName"/>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>5</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="btnOpenFile">
+       <property name="maximumSize">
+        <size>
+         <width>30</width>
+         <height>20</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item>
     <widget class="QPushButton" name="btnStartRecording">
      <property name="toolTip">
       <string>Do image processing</string>
      </property>
      <property name="text">
       <string>Start Recording</string>
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QPushButton" name="btnStopRecording">
+     <property name="text">
+      <string>Stop Recording</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QPushButton" name="btnPlay">
      <property name="text">
       <string>Play Recording</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>