diff --git a/Plugins/org.mitk.gui.qt.moviemaker2/src/internal/QmitkMovieMaker2View.cpp b/Plugins/org.mitk.gui.qt.moviemaker2/src/internal/QmitkMovieMaker2View.cpp
index 2977e4a432..3e35000f3e 100644
--- a/Plugins/org.mitk.gui.qt.moviemaker2/src/internal/QmitkMovieMaker2View.cpp
+++ b/Plugins/org.mitk.gui.qt.moviemaker2/src/internal/QmitkMovieMaker2View.cpp
@@ -1,664 +1,664 @@
 /*===================================================================
 
 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.
 
 ===================================================================*/
 
 #include "QmitkAnimationItemDelegate.h"
 #include "QmitkFFmpegWriter.h"
 #include "QmitkMovieMaker2View.h"
 #include "QmitkOrbitAnimationItem.h"
 #include "QmitkOrbitAnimationWidget.h"
 #include "QmitkSliceAnimationItem.h"
 #include "QmitkSliceAnimationWidget.h"
 #include <ui_QmitkMovieMaker2View.h>
 #include <QFileDialog>
 #include <QMenu>
 #include <QMessageBox>
 #include <QStandardItemModel>
 #include <QTimer>
 #include <mitkBaseRenderer.h>
 #include <mitkGL.h>
 
 static QmitkAnimationItem* CreateDefaultAnimation(const QString& widgetKey)
 {
   if (widgetKey == "Orbit")
     return new QmitkOrbitAnimationItem;
 
   if (widgetKey == "Slice")
     return new QmitkSliceAnimationItem;
 
   return NULL;
 }
 
 static QString GetFFmpegPath()
 {
   berry::IPreferencesService::Pointer preferencesService =
     berry::Platform::GetServiceRegistry().GetServiceById<berry::IPreferencesService>(berry::IPreferencesService::ID);
 
   berry::IPreferences::Pointer preferences = preferencesService->GetSystemPreferences()->Node("/org.mitk.gui.qt.ext.externalprograms");
 
   return QString::fromStdString(preferences->Get("ffmpeg", ""));
 }
 
 static unsigned char* ReadPixels(vtkRenderWindow* renderWindow, int x, int y, int width, int height)
 {
   if (renderWindow == NULL)
     return NULL;
 
   unsigned char* frame = new unsigned char[width * height * 3];
 
   renderWindow->MakeCurrent();
   glReadPixels(x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, frame);
 
   return frame;
 }
 
 const std::string QmitkMovieMaker2View::VIEW_ID = "org.mitk.views.moviemaker2";
 
 QmitkMovieMaker2View::QmitkMovieMaker2View()
   : m_FFmpegWriter(NULL),
     m_Ui(new Ui::QmitkMovieMaker2View),
     m_AnimationModel(NULL),
     m_AddAnimationMenu(NULL),
     m_RecordMenu(NULL),
     m_Timer(NULL),
     m_TotalDuration(0.0),
     m_NumFrames(0),
     m_CurrentFrame(0)
 {
 }
 
 QmitkMovieMaker2View::~QmitkMovieMaker2View()
 {
 }
 
 void QmitkMovieMaker2View::CreateQtPartControl(QWidget* parent)
 {
   m_FFmpegWriter = new QmitkFFmpegWriter(parent);
 
   m_Ui->setupUi(parent);
 
   this->InitializeAnimationWidgets();
   this->InitializeAnimationTreeViewWidgets();
   this->InitializePlaybackAndRecordWidgets();
   this->InitializeTimer(parent);
 
   m_Ui->animationWidgetGroupBox->setVisible(false);
 }
 
 void QmitkMovieMaker2View::InitializeAnimationWidgets()
 {
   m_AnimationWidgets["Orbit"] = new QmitkOrbitAnimationWidget;
   m_AnimationWidgets["Slice"] = new QmitkSliceAnimationWidget;
 
   Q_FOREACH(QWidget* widget, m_AnimationWidgets.values())
   {
     if (widget != NULL)
     {
       widget->setVisible(false);
       m_Ui->animationWidgetGroupBoxLayout->addWidget(widget);
     }
   }
 
   this->ConnectAnimationWidgets();
 }
 
 void QmitkMovieMaker2View::InitializeAnimationTreeViewWidgets()
 {
   this->InitializeAnimationModel();
   this->InitializeAddAnimationMenu();
   this->ConnectAnimationTreeViewWidgets();
 }
 
 void QmitkMovieMaker2View::InitializePlaybackAndRecordWidgets()
 {
   this->InitializeRecordMenu();
   this->ConnectPlaybackAndRecordWidgets();
 }
 
 void QmitkMovieMaker2View::InitializeAnimationModel()
 {
   m_AnimationModel = new QStandardItemModel(m_Ui->animationTreeView);
   m_AnimationModel->setHorizontalHeaderLabels(QStringList() << "Animation" << "Timeline");
   m_Ui->animationTreeView->setModel(m_AnimationModel);
 
   m_Ui->animationTreeView->setItemDelegate(new QmitkAnimationItemDelegate(m_Ui->animationTreeView));
 }
 
 void QmitkMovieMaker2View::InitializeAddAnimationMenu()
 {
   m_AddAnimationMenu = new QMenu(m_Ui->addAnimationButton);
 
   Q_FOREACH(const QString& key, m_AnimationWidgets.keys())
   {
     m_AddAnimationMenu->addAction(key);
   }
 }
 
 void QmitkMovieMaker2View::InitializeRecordMenu()
 {
   typedef QPair<QString, QString> PairOfStrings;
 
   m_RecordMenu = new QMenu(m_Ui->recordButton);
 
   QVector<PairOfStrings> renderWindows;
   renderWindows.push_back(qMakePair(QString("Axial"), QString("stdmulti.widget1")));
   renderWindows.push_back(qMakePair(QString("Sagittal"), QString("stdmulti.widget2")));
   renderWindows.push_back(qMakePair(QString("Coronal"), QString("stdmulti.widget3")));
   renderWindows.push_back(qMakePair(QString("3D"), QString("stdmulti.widget4")));
 
   Q_FOREACH(const PairOfStrings& renderWindow, renderWindows)
   {
     QAction* action = new QAction(m_RecordMenu);
     action->setText(renderWindow.first);
     action->setData(renderWindow.second);
 
     m_RecordMenu->addAction(action);
   }
 }
 
 void QmitkMovieMaker2View::InitializeTimer(QWidget* parent)
 {
   m_Timer = new QTimer(parent);
 
   this->OnFPSSpinBoxValueChanged(m_Ui->fpsSpinBox->value());
   this->ConnectTimer();
 }
 
 void QmitkMovieMaker2View::ConnectAnimationTreeViewWidgets()
 {
   this->connect(m_AnimationModel, SIGNAL(rowsInserted(const QModelIndex&, int, int)),
     this, SLOT(OnAnimationTreeViewRowsInserted(const QModelIndex&, int, int)));
 
   this->connect(m_AnimationModel, SIGNAL(rowsRemoved(const QModelIndex&, int, int)),
     this, SLOT(OnAnimationTreeViewRowsRemoved(const QModelIndex&, int, int)));
 
   this->connect(m_Ui->animationTreeView->selectionModel(), SIGNAL(selectionChanged(const QItemSelection&, const QItemSelection&)),
     this, SLOT(OnAnimationTreeViewSelectionChanged(const QItemSelection&, const QItemSelection&)));
 
   this->connect(m_Ui->moveAnimationUpButton, SIGNAL(clicked()),
     this, SLOT(OnMoveAnimationUpButtonClicked()));
 
   this->connect(m_Ui->moveAnimationDownButton, SIGNAL(clicked()),
     this, SLOT(OnMoveAnimationDownButtonClicked()));
 
   this->connect(m_Ui->addAnimationButton, SIGNAL(clicked()),
     this, SLOT(OnAddAnimationButtonClicked()));
 
   this->connect(m_Ui->removeAnimationButton, SIGNAL(clicked()),
     this, SLOT(OnRemoveAnimationButtonClicked()));
 }
 
 void QmitkMovieMaker2View::ConnectAnimationWidgets()
 {
   this->connect(m_Ui->startComboBox, SIGNAL(currentIndexChanged(int)),
     this, SLOT(OnStartComboBoxCurrentIndexChanged(int)));
 
   this->connect(m_Ui->durationSpinBox, SIGNAL(valueChanged(double)),
     this, SLOT(OnDurationSpinBoxValueChanged(double)));
 
   this->connect(m_Ui->delaySpinBox, SIGNAL(valueChanged(double)),
     this, SLOT(OnDelaySpinBoxValueChanged(double)));
 }
 
 void QmitkMovieMaker2View::ConnectPlaybackAndRecordWidgets()
 {
   this->connect(m_Ui->playButton, SIGNAL(toggled(bool)),
     this, SLOT(OnPlayButtonToggled(bool)));
 
   this->connect(m_Ui->stopButton, SIGNAL(clicked()),
     this, SLOT(OnStopButtonClicked()));
 
   this->connect(m_Ui->recordButton, SIGNAL(clicked()),
     this, SLOT(OnRecordButtonClicked()));
 
   this->connect(m_Ui->fpsSpinBox, SIGNAL(valueChanged(int)),
     this, SLOT(OnFPSSpinBoxValueChanged(int)));
 }
 
 void QmitkMovieMaker2View::ConnectTimer()
 {
   this->connect(m_Timer, SIGNAL(timeout()),
     this, SLOT(OnTimerTimeout()));
 }
 
 void QmitkMovieMaker2View::SetFocus()
 {
   m_Ui->addAnimationButton->setFocus();
 }
 
 void QmitkMovieMaker2View::OnMoveAnimationUpButtonClicked()
 {
   const QItemSelection selection = m_Ui->animationTreeView->selectionModel()->selection();
 
   if (!selection.isEmpty())
   {
     const int selectedRow = selection[0].top();
 
     if (selectedRow > 0)
       m_AnimationModel->insertRow(selectedRow - 1, m_AnimationModel->takeRow(selectedRow));
   }
 
   this->CalculateTotalDuration();
 }
 
 void QmitkMovieMaker2View::OnMoveAnimationDownButtonClicked()
 {
   const QItemSelection selection = m_Ui->animationTreeView->selectionModel()->selection();
 
   if (!selection.isEmpty())
   {
     const int rowCount = m_AnimationModel->rowCount();
     const int selectedRow = selection[0].top();
 
     if (selectedRow < rowCount - 1)
       m_AnimationModel->insertRow(selectedRow + 1, m_AnimationModel->takeRow(selectedRow));
   }
 
   this->CalculateTotalDuration();
 }
 
 void QmitkMovieMaker2View::OnAddAnimationButtonClicked()
 {
   QAction* action = m_AddAnimationMenu->exec(QCursor::pos());
 
   if (action != NULL)
   {
     const QString widgetKey = action->text();
 
     m_AnimationModel->appendRow(QList<QStandardItem*>()
       << new QStandardItem(widgetKey)
       << CreateDefaultAnimation(widgetKey));
 
     m_Ui->playbackAndRecordingGroupBox->setEnabled(true);
   }
 }
 
 void QmitkMovieMaker2View::OnPlayButtonToggled(bool checked)
 {
   if (checked)
   {
     m_Ui->playButton->setIcon(QIcon(":/org_mitk_icons/icons/tango/scalable/actions/media-playback-pause.svg"));
     m_Ui->playButton->repaint();
 
     m_Timer->start(static_cast<int>(1000.0 / m_Ui->fpsSpinBox->value()));
   }
   else
   {
     m_Timer->stop();
 
     m_Ui->playButton->setIcon(QIcon(":/org_mitk_icons/icons/tango/scalable/actions/media-playback-start.svg"));
     m_Ui->playButton->repaint();
   }
 }
 
 void QmitkMovieMaker2View::OnStopButtonClicked()
 {
   m_Ui->playButton->setChecked(false);
   m_Ui->stopButton->setEnabled(false);
 
   m_CurrentFrame = 0;
   this->RenderCurrentFrame();
 }
 
 void QmitkMovieMaker2View::OnRecordButtonClicked() // TODO: Refactor
 {
   m_FFmpegWriter->SetFFmpegPath(GetFFmpegPath());
 
   if (m_FFmpegWriter->GetFFmpegPath().isEmpty())
   {
     QMessageBox::critical(NULL, "Movie Maker 2", "Path to FFmpeg executable is not set in preferences!");
     return;
   }
 
   QAction* action = m_RecordMenu->exec(QCursor::pos());
 
   if (action == NULL)
     return;
 
   vtkRenderWindow* renderWindow = mitk::BaseRenderer::GetRenderWindowByName(action->data().toString().toStdString());
 
   if (renderWindow == NULL)
     return;
 
   const int border = 3;
   const int x = border;
   const int y = border;
   int width = renderWindow->GetSize()[0] - border * 2;
   int height = renderWindow->GetSize()[1] - border * 2;
 
   if (width & 1)
     --width;
 
   if (height & 1)
     --height;
 
   if (width < 16 || height < 16)
     return;
 
   m_FFmpegWriter->SetSize(width, height);
   m_FFmpegWriter->SetFramerate(m_Ui->fpsSpinBox->value());
 
   QString saveFileName = QFileDialog::getSaveFileName(NULL, "Specify a filename", "", "Movie (*.mp4)");
 
   if (saveFileName.isEmpty())
     return;
 
   if(!saveFileName.endsWith(".mp4"))
     saveFileName += ".mp4";
 
   m_FFmpegWriter->SetOutputPath(saveFileName);
 
   try
   {
     m_FFmpegWriter->Start();
 
     for (m_CurrentFrame = 0; m_CurrentFrame < m_NumFrames; ++m_CurrentFrame)
     {
       this->RenderCurrentFrame();
 
       renderWindow->MakeCurrent();
       unsigned char* frame = ReadPixels(renderWindow, x, y, width, height);
       m_FFmpegWriter->WriteFrame(frame);
       delete[] frame;
     }
 
     m_FFmpegWriter->Stop();
 
     m_CurrentFrame = 0;
     this->RenderCurrentFrame();
   }
   catch (const mitk::Exception& exception)
   {
     m_CurrentFrame = 0;
     this->RenderCurrentFrame();
 
     QMessageBox::critical(NULL, "Movie Maker 2", exception.GetDescription());
   }
 }
 
 void QmitkMovieMaker2View::OnRemoveAnimationButtonClicked()
 {
   const QItemSelection selection = m_Ui->animationTreeView->selectionModel()->selection();
 
   if (!selection.isEmpty())
     m_AnimationModel->removeRow(selection[0].top());
 }
 
 void QmitkMovieMaker2View::OnAnimationTreeViewRowsInserted(const QModelIndex& parent, int start, int)
 {
   this->CalculateTotalDuration();
 
   m_Ui->animationTreeView->selectionModel()->select(
     m_AnimationModel->index(start, 0, parent),
     QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
 }
 
 void QmitkMovieMaker2View::OnAnimationTreeViewRowsRemoved(const QModelIndex&, int, int)
 {
   this->CalculateTotalDuration();
   this->UpdateWidgets();
 }
 
 void QmitkMovieMaker2View::OnAnimationTreeViewSelectionChanged(const QItemSelection&, const QItemSelection&)
 {
   this->UpdateWidgets();
 }
 
 void QmitkMovieMaker2View::OnStartComboBoxCurrentIndexChanged(int index)
 {
   QmitkAnimationItem* item = this->GetSelectedAnimationItem();
 
   if (item != NULL)
   {
     item->SetStartWithPrevious(index);
     this->RedrawTimeline();
     this->CalculateTotalDuration();
   }
 }
 
 void QmitkMovieMaker2View::OnDurationSpinBoxValueChanged(double value)
 {
   QmitkAnimationItem* item = this->GetSelectedAnimationItem();
 
   if (item != NULL)
   {
     item->SetDuration(value);
     this->RedrawTimeline();
-
+    this->CalculateTotalDuration();
   }
 }
 
 void QmitkMovieMaker2View::OnDelaySpinBoxValueChanged(double value)
 {
   QmitkAnimationItem* item = this->GetSelectedAnimationItem();
 
   if (item != NULL)
   {
     item->SetDelay(value);
     this->RedrawTimeline();
     this->CalculateTotalDuration();
   }
 }
 
 void QmitkMovieMaker2View::OnFPSSpinBoxValueChanged(int value)
 {
   this->CalculateTotalDuration();
   m_Timer->setInterval(static_cast<int>(1000.0 / value));
 }
 
 void QmitkMovieMaker2View::OnTimerTimeout()
 {
   this->RenderCurrentFrame();
 
   m_CurrentFrame = std::min(m_NumFrames, m_CurrentFrame + 1);
 
   if (m_CurrentFrame >= m_NumFrames)
   {
     m_Ui->playButton->setChecked(false);
 
     m_CurrentFrame = 0;
     this->RenderCurrentFrame();
   }
 
   m_Ui->stopButton->setEnabled(m_CurrentFrame != 0);
 }
 
 void QmitkMovieMaker2View::RenderCurrentFrame()
 {
   typedef QPair<QmitkAnimationItem*, double> AnimationIterpolationFactorPair;
 
   const double deltaT = m_TotalDuration / (m_NumFrames - 1);
   const QVector<AnimationIterpolationFactorPair> activeAnimations = this->GetActiveAnimations(m_CurrentFrame * deltaT);
 
   Q_FOREACH(const AnimationIterpolationFactorPair& animation, activeAnimations)
   {
     animation.first->Animate(animation.second);
   }
 
   mitk::RenderingManager::GetInstance()->ForceImmediateUpdateAll();
 }
 
 void QmitkMovieMaker2View::UpdateWidgets()
 {
   const QItemSelection selection = m_Ui->animationTreeView->selectionModel()->selection();
 
   if (selection.isEmpty())
   {
     m_Ui->moveAnimationUpButton->setEnabled(false);
     m_Ui->moveAnimationDownButton->setEnabled(false);
     m_Ui->removeAnimationButton->setEnabled(false);
     m_Ui->playbackAndRecordingGroupBox->setEnabled(false);
 
     this->HideCurrentAnimationWidget();
   }
   else
   {
     const int rowCount = m_AnimationModel->rowCount();
     const int selectedRow = selection[0].top();
 
     m_Ui->moveAnimationUpButton->setEnabled(rowCount > 1 && selectedRow != 0);
     m_Ui->moveAnimationDownButton->setEnabled(rowCount > 1 && selectedRow < rowCount - 1);
     m_Ui->removeAnimationButton->setEnabled(true);
     m_Ui->playbackAndRecordingGroupBox->setEnabled(true);
 
     this->ShowAnimationWidget(dynamic_cast<QmitkAnimationItem*>(m_AnimationModel->item(selectedRow, 1)));
   }
 
   this->UpdateAnimationWidgets();
 }
 
 void QmitkMovieMaker2View::UpdateAnimationWidgets()
 {
   QmitkAnimationItem* item = this->GetSelectedAnimationItem();
 
   if (item != NULL)
   {
     m_Ui->startComboBox->setCurrentIndex(item->GetStartWithPrevious());
     m_Ui->durationSpinBox->setValue(item->GetDuration());
     m_Ui->delaySpinBox->setValue(item->GetDelay());
 
     m_Ui->animationGroupBox->setEnabled(true);
   }
   else
   {
     m_Ui->animationGroupBox->setEnabled(false);
   }
 }
 
 void QmitkMovieMaker2View::HideCurrentAnimationWidget()
 {
   if (m_Ui->animationWidgetGroupBox->isVisible())
   {
     m_Ui->animationWidgetGroupBox->setVisible(false);
 
     int numWidgets = m_Ui->animationWidgetGroupBoxLayout->count();
 
     for (int i = 0; i < numWidgets; ++i)
       m_Ui->animationWidgetGroupBoxLayout->itemAt(i)->widget()->setVisible(false);
   }
 }
 
 void QmitkMovieMaker2View::ShowAnimationWidget(QmitkAnimationItem* animationItem)
 {
   this->HideCurrentAnimationWidget();
 
   if (animationItem == NULL)
     return;
 
   const QString widgetKey = animationItem->GetWidgetKey();
   QmitkAnimationWidget* animationWidget = NULL;
 
   if (m_AnimationWidgets.contains(widgetKey))
   {
     animationWidget = m_AnimationWidgets[widgetKey];
 
     if (animationWidget != NULL)
     {
       m_Ui->animationWidgetGroupBox->setTitle(widgetKey);
       animationWidget->SetAnimationItem(animationItem);
       animationWidget->setVisible(true);
     }
   }
 
   m_Ui->animationWidgetGroupBox->setVisible(animationWidget != NULL);
 }
 
 void QmitkMovieMaker2View::RedrawTimeline()
 {
   if (m_AnimationModel->rowCount() > 1)
   {
     m_Ui->animationTreeView->dataChanged(
       m_AnimationModel->index(0, 1),
       m_AnimationModel->index(m_AnimationModel->rowCount() - 1, 1));
   }
 }
 
 QmitkAnimationItem* QmitkMovieMaker2View::GetSelectedAnimationItem() const
 {
   const QItemSelection selection = m_Ui->animationTreeView->selectionModel()->selection();
 
   return !selection.isEmpty()
     ? dynamic_cast<QmitkAnimationItem*>(m_AnimationModel->item(selection[0].top(), 1))
     : NULL;
 }
 
 void QmitkMovieMaker2View::CalculateTotalDuration()
 {
   const int rowCount = m_AnimationModel->rowCount();
 
   double totalDuration = 0.0;
   double previousStart = 0.0;
 
   for (int i = 0; i < rowCount; ++i)
   {
     QmitkAnimationItem* item = dynamic_cast<QmitkAnimationItem*>(m_AnimationModel->item(i, 1));
 
     if (item == NULL)
       continue;
 
     if (item->GetStartWithPrevious())
     {
       totalDuration = std::max(totalDuration, previousStart + item->GetDelay() + item->GetDuration());
     }
     else
     {
       previousStart = totalDuration;
       totalDuration += item->GetDelay() + item->GetDuration();
     }
   }
 
   m_TotalDuration = totalDuration; // TODO totalDuration == 0
   m_NumFrames = static_cast<int>(totalDuration * m_Ui->fpsSpinBox->value()); // TODO numFrames < 2
 }
 
 QVector<QPair<QmitkAnimationItem*, double> > QmitkMovieMaker2View::GetActiveAnimations(double t) const
 {
   const int rowCount = m_AnimationModel->rowCount();
 
   QVector<QPair<QmitkAnimationItem*, double> > activeAnimations;
 
   double totalDuration = 0.0;
   double previousStart = 0.0;
 
   for (int i = 0; i < rowCount; ++i)
   {
     QmitkAnimationItem* item = dynamic_cast<QmitkAnimationItem*>(m_AnimationModel->item(i, 1));
 
     if (item == NULL)
       continue;
 
     if (item->GetDuration() > 0.0)
     {
       double start = item->GetStartWithPrevious()
         ? previousStart + item->GetDelay()
         : totalDuration + item->GetDelay();
 
       if (start <= t && t <= start + item->GetDuration())
         activeAnimations.push_back(qMakePair(item, (t - start) / item->GetDuration()));
     }
 
     if (item->GetStartWithPrevious())
     {
       totalDuration = std::max(totalDuration, previousStart + item->GetDelay() + item->GetDuration());
     }
     else
     {
       previousStart = totalDuration;
       totalDuration += item->GetDelay() + item->GetDuration();
     }
   }
 
   return activeAnimations;
 }