diff --git a/src/gui/panels/timeline-panel.cpp b/src/gui/panels/timeline-panel.cpp
index 65e9ae6b7..b079c0b2f 100644
--- a/src/gui/panels/timeline-panel.cpp
+++ b/src/gui/panels/timeline-panel.cpp
@@ -39,6 +39,11 @@ const int TimelinePanel::ZoomToolSteps = 2; // 2 seems comfortable
 
 TimelinePanel::TimelinePanel() :
   Panel("timeline", _("Timeline"), "panel_timeline"),
+  previousButton(Stock::MEDIA_PREVIOUS),
+  rewindButton(Stock::MEDIA_REWIND),
+  playPauseButton(Stock::MEDIA_PLAY),
+  forwardButton(Stock::MEDIA_FORWARD),
+  nextButton(Stock::MEDIA_NEXT),
   arrowTool(Gtk::StockID("tool_arrow")),
   iBeamTool(Gtk::StockID("tool_i_beam")),
   zoomIn(Stock::ZOOM_IN),
@@ -52,6 +57,13 @@ TimelinePanel::TimelinePanel() :
   
   // Setup the toolbar
   timeIndicatorButton.set_label_widget(timeIndicator);
+  
+  toolbar.append(previousButton);
+  toolbar.append(rewindButton);
+  toolbar.append(playPauseButton);
+  toolbar.append(forwardButton);
+  toolbar.append(nextButton);
+    
   toolbar.append(timeIndicatorButton);
   
   toolbar.append(seperator1);
@@ -60,7 +72,9 @@ TimelinePanel::TimelinePanel() :
     &TimelinePanel::on_arrow_tool));
   toolbar.append(iBeamTool, mem_fun(this,
     &TimelinePanel::on_ibeam_tool));
+    
   toolbar.append(seperator2);
+  
   toolbar.append(zoomIn, mem_fun(this, &TimelinePanel::on_zoom_in));
   toolbar.append(zoomOut, mem_fun(this, &TimelinePanel::on_zoom_out));
   
diff --git a/src/gui/panels/timeline-panel.hpp b/src/gui/panels/timeline-panel.hpp
index b46218e87..e154e9a26 100644
--- a/src/gui/panels/timeline-panel.hpp
+++ b/src/gui/panels/timeline-panel.hpp
@@ -75,6 +75,16 @@ private:
   TimelineWidget timelineWidget;
   
   // Toolbar Widgets
+  
+  Gtk::Label timeIndicator;
+  Gtk::ToolButton timeIndicatorButton;
+  
+  Gtk::ToolButton previousButton;
+  Gtk::ToolButton rewindButton;
+  Gtk::ToolButton playPauseButton;
+  Gtk::ToolButton forwardButton;
+  Gtk::ToolButton nextButton;
+    
   Gtk::ToggleToolButton arrowTool;
   Gtk::ToggleToolButton iBeamTool;
   
@@ -84,10 +94,7 @@ private:
   Gtk::ToolButton zoomOut;
   
   Gtk::SeparatorToolItem seperator2;
-  
-  Gtk::Label timeIndicator;
-  Gtk::ToolButton timeIndicatorButton;
-  
+    
   // Internals
   bool updatingToolbar;
   
diff --git a/src/gui/panels/viewer-panel.cpp b/src/gui/panels/viewer-panel.cpp
index 323859b9a..ee129a606 100644
--- a/src/gui/panels/viewer-panel.cpp
+++ b/src/gui/panels/viewer-panel.cpp
@@ -31,20 +31,11 @@ namespace gui {
 namespace panels {
 
 ViewerPanel::ViewerPanel() :
-  Panel("viewer", _("Viewer"), "panel_viewer"),
-  previousButton(Stock::MEDIA_PREVIOUS),
-  rewindButton(Stock::MEDIA_REWIND),
-  playPauseButton(Stock::MEDIA_PLAY),
-  forwardButton(Stock::MEDIA_FORWARD),
-  nextButton(Stock::MEDIA_NEXT)
+  Panel("viewer", _("Viewer"), "panel_viewer")
   {
     //----- Set up the Tool Bar -----//
     // Add the commands
-    toolBar.append(previousButton);
-    toolBar.append(rewindButton);
-    toolBar.append(playPauseButton);
-    toolBar.append(forwardButton);
-    toolBar.append(nextButton);
+
     
     // Configure the toolbar
     toolBar.set_toolbar_style(TOOLBAR_ICONS);
diff --git a/src/gui/panels/viewer-panel.hpp b/src/gui/panels/viewer-panel.hpp
index 9f92b4f63..5400aee41 100644
--- a/src/gui/panels/viewer-panel.hpp
+++ b/src/gui/panels/viewer-panel.hpp
@@ -31,9 +31,6 @@
 #include "panel.hpp"
 #include "../widgets/video-display-widget.hpp"
 
-using namespace lumiera::gui::widgets;
-using namespace Gtk;
-
 namespace lumiera {
 namespace gui {
 namespace panels {
@@ -45,14 +42,8 @@ namespace panels {
 
     protected:
 
-      ToolButton previousButton;
-      ToolButton rewindButton;
-      ToolButton playPauseButton;
-      ToolButton forwardButton;
-      ToolButton nextButton;
-
-      VideoDisplayWidget display;
-      Toolbar toolBar;
+      lumiera::gui::widgets::VideoDisplayWidget display;
+      Gtk::Toolbar toolBar;
     };
 
 }   // namespace panels