diff --git a/ChangeLog b/ChangeLog
index e775eafe8..b3be34fd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,6 @@
 	
 	* include/piano_roll.h:
 	* src/core/piano_roll.cpp:
-	* include/note.h:
-	* src/core/note.cpp:
 	- don't play notes when you click on one if the song is already playing
 	- now you can move and resize unquantized notes in quantized amounts
 	- shift+drag to copy one or more notes (we need to figure out some other
@@ -11,6 +9,17 @@
 	- removed stagnant note movement code 
 	- dragging a group of notes to boundary conditions is handled correctly
 	- ability to scroll using arrow keys while dragging notes
+	
+	* include/note.h:
+	* src/core/note.cpp:
+	refactored code (inline setXXX, etc)
+	
+	* include/song.h
+	* include/song_editor.h
+	* src/gui/song_editor.cpp
+	* include/main_window.h
+	* src/gui/main_window.cpp
+	moved main window toolbar code from songEditor to mainWindow
 
 2008-12-04	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
diff --git a/TODO b/TODO
index b9b253ce3..b6b89d0bf 100644
--- a/TODO
+++ b/TODO
@@ -63,6 +63,7 @@ Andrew Kelley's todo:
 - add note panning ability to piano roll
 - make piano roll grid change based on quantization
 
+- "paintbrush" tool for the song editor, to easily "paint" beat+basslines
 - when you clone a track in the song editor, rename the track so that it doesn't have the same name (increment the number if necessary)
 - somehow enable easy pattern copy pasting in the beat+bassline editor
 - make knobs easier to tune (less sensitive)
@@ -74,3 +75,5 @@ Andrew Kelley's todo:
 - make it so that 3xosc notes don't max out
 - implement note detuning (used to be ctrl+click to access note detuning) (need some other intuitive way to access note detuning as ctrl, shift, and alt are all being used)
 - make the horizontal scroll bar do the same thing as shift+vertical scroll bar
+- add a "Set exact value" to a right clicked automation menu
+- enable "auto detect" by default when you bring up the "connect to controller" window
diff --git a/include/main_window.h b/include/main_window.h
index daed10e2a..160346509 100644
--- a/include/main_window.h
+++ b/include/main_window.h
@@ -34,13 +34,20 @@
 class QAction;
 class QDomElement;
 class QGridLayout;
+class QHBoxLayout;
 class QMdiArea;
 
+class lcdSpinBox;
+class meterDialog;
+class automatableSlider;
+class textFloat;
+
 class configManager;
 class pluginView;
 class toolButton;
 
 
+
 class mainWindow : public QMainWindow
 {
 	Q_OBJECT
@@ -55,8 +62,8 @@ public:
 		return( m_toolBar );
 	}
 
-	int addWidgetToToolBar( QWidget * _w, int _row = -1, int _col = -1 );
-	void addSpacingToToolBar( int _size );
+	//int addWidgetToToolBar( QWidget * _w, int _row = -1, int _col = -1 );
+	//void addSpacingToToolBar( int _size );
 
 
 	// every function that replaces current file (e.g. creates new file,
@@ -137,8 +144,18 @@ private:
 	QMdiArea * m_workspace;
 
 	QWidget * m_toolBar;
-	QGridLayout * m_toolBarLayout;
-
+	QHBoxLayout * m_toolBarLayout;
+	
+	
+	lcdSpinBox * m_tempoSpinBox;
+	meterDialog * m_timeSigDisplay;
+		
+	automatableSlider * m_masterVolumeSlider;
+	automatableSlider * m_masterPitchSlider;
+		
+	textFloat * m_mvsStatus;
+	textFloat * m_mpsStatus;
+		
 	QMenu * m_templatesMenu;
 	QMenu * m_recentlyOpenedProjectsMenu;
 	int m_custom_templates_count;
@@ -166,6 +183,17 @@ private:
 
 
 private slots:
+	void setHighQuality( bool );
+	
+	void masterVolumeChanged( int _new_val );
+	void masterVolumePressed( void );
+	void masterVolumeMoved( int _new_val );
+	void masterVolumeReleased( void );
+	void masterPitchChanged( int _new_val );
+	void masterPitchPressed( void );
+	void masterPitchMoved( int _new_val );
+	void masterPitchReleased( void );
+		
 	void browseHelp( void );
 	void fillTemplatesMenu( void );
 	void openRecentlyOpenedProject( QAction * _action );
diff --git a/include/note.h b/include/note.h
index c8c1c82b1..e5a6017a3 100644
--- a/include/note.h
+++ b/include/note.h
@@ -91,10 +91,13 @@ public:
 	note( const note & _note );
 	virtual ~note();
 	
-	void setSelected( const bool _selected );
-	void setOldKey( const int _oldKey );
-	void setOldPos( const midiTime & _oldPos );
-	void setOldLength( const midiTime & _oldLength );
+	inline void setSelected( const bool _selected ){ m_selected = _selected; }
+	inline void setOldKey( const int _oldKey ){ m_oldKey = _oldKey; }
+	inline void setOldPos( const midiTime & _oldPos ){ m_oldPos = _oldPos; }
+	inline void setOldLength( const midiTime & _oldLength )
+	{
+		m_oldLength = _oldLength;
+	}
 	
 	void setLength( const midiTime & _length );
 	void setPos( const midiTime & _pos );
diff --git a/include/song.h b/include/song.h
index fc8e85042..cb60e770d 100644
--- a/include/song.h
+++ b/include/song.h
@@ -308,6 +308,7 @@ private:
 
 	friend class engine;
 	friend class songEditor;
+	friend class mainWindow;
 	friend class controllerRackView;
 
 signals:
diff --git a/include/song_editor.h b/include/song_editor.h
index 041adb304..16495cb66 100644
--- a/include/song_editor.h
+++ b/include/song_editor.h
@@ -32,12 +32,8 @@
 class QLabel;
 class QScrollBar;
 
-class automatableSlider;
 class comboBox;
-class lcdSpinBox;
-class meterDialog;
 class song;
-class textFloat;
 class timeLine;
 class toolButton;
 
@@ -65,22 +61,12 @@ public slots:
 
 
 private slots:
-	void setHighQuality( bool );
 
 	void play( void );
 	void record( void );
 	void recordAccompany( void );
 	void stop( void );
 
-	void masterVolumeChanged( int _new_val );
-	void masterVolumePressed( void );
-	void masterVolumeMoved( int _new_val );
-	void masterVolumeReleased( void );
-	void masterPitchChanged( int _new_val );
-	void masterPitchPressed( void );
-	void masterPitchMoved( int _new_val );
-	void masterPitchReleased( void );
-
 	void updatePosition( const midiTime & _t );
 
 	void zoomingChanged( void );
@@ -104,14 +90,6 @@ private:
 	toolButton * m_recordButton;
 	toolButton * m_recordAccompanyButton;
 	toolButton * m_stopButton;
-	lcdSpinBox * m_tempoSpinBox;
-
-	meterDialog * m_timeSigDisplay;
-	automatableSlider * m_masterVolumeSlider;
-	automatableSlider * m_masterPitchSlider;
-
-	textFloat * m_mvsStatus;
-	textFloat * m_mpsStatus;
 
 	toolButton * m_addBBTrackButton;
 	toolButton * m_addSampleTrackButton;
diff --git a/src/core/note.cpp b/src/core/note.cpp
index 10e117cfb..9801d2d59 100644
--- a/src/core/note.cpp
+++ b/src/core/note.cpp
@@ -92,38 +92,6 @@ note::~note()
 
 
 
-void note::setSelected( const bool _selected )
-{
-	m_selected = _selected;
-}
-
-
-
-
-void note::setOldKey( const int _oldKey )
-{
-	m_oldKey = _oldKey;
-}
-
-
-
-
-void note::setOldPos( const midiTime & _oldPos )
-{
-	m_oldPos = _oldPos;
-}
-
-
-
-
-void note::setOldLength( const midiTime & _oldLength )
-{
-	m_oldLength = _oldLength;
-}
-
-
-
-
 void note::setLength( const midiTime & _length )
 {
 //	addJournalEntry( journalEntry( ChangeLength, m_length - _length ) );
diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp
index b33ebca51..49eafe85c 100644
--- a/src/gui/main_window.cpp
+++ b/src/gui/main_window.cpp
@@ -36,6 +36,8 @@
 #include <QtGui/QMenuBar>
 #include <QtGui/QMessageBox>
 #include <QtGui/QSplitter>
+#include <QtGui/QCheckBox>
+
 
 #include "main_window.h"
 #include "bb_editor.h"
@@ -61,7 +63,13 @@
 #include "project_journal.h"
 #include "automation_editor.h"
 #include "templates.h"
-
+#include "lcd_spinbox.h"
+#include "tooltip.h"
+#include "meter_dialog.h"
+#include "automatable_slider.h"
+#include "text_float.h"
+#include "cpuload_widget.h"
+#include "visualization_widget.h"
 
 
 
@@ -168,11 +176,12 @@ mainWindow::mainWindow( void ) :
 	// create global-toolbar at the top of our window
 	m_toolBar = new QWidget( main_widget );
 	m_toolBar->setObjectName( "mainToolbar" );
+	m_toolBar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 	m_toolBar->setFixedHeight( 64 );
 	m_toolBar->move( 0, 0 );
 
 	// add layout for organizing quite complex toolbar-layouting
-	m_toolBarLayout = new QGridLayout( m_toolBar/*, 2, 1*/ );
+	m_toolBarLayout = new QHBoxLayout( m_toolBar );
 	m_toolBarLayout->setMargin( 0 );
 	m_toolBarLayout->setSpacing( 0 );
 
@@ -319,18 +328,23 @@ void mainWindow::finalize( void )
 	help_menu->addAction( embed::getIconPixmap( "icon" ), tr( "About" ),
 			      this, SLOT( aboutLMMS() ) );
 
+	// create the grid layout for the first buttons area
+	QWidget * gridButtons_w = new QWidget( m_toolBar );
+	QGridLayout * gridButtons_layout = new QGridLayout( gridButtons_w/*, 2, 1*/ );
+
+	
 	// create tool-buttons
 	toolButton * project_new = new toolButton(
 					embed::getIconPixmap( "project_new" ),
 					tr( "Create new project" ),
 					this, SLOT( createNewProject() ),
-							m_toolBar );
+							gridButtons_w );
 
 	toolButton * project_new_from_template = new toolButton(
 			embed::getIconPixmap( "project_new_from_template" ),
 				tr( "Create new project from template" ),
 					this, SLOT( emptySlot() ),
-							m_toolBar );
+							gridButtons_w );
 
 	m_templatesMenu = new QMenu( project_new_from_template );
 	connect( m_templatesMenu, SIGNAL( aboutToShow() ),
@@ -344,13 +358,13 @@ void mainWindow::finalize( void )
 					embed::getIconPixmap( "project_open" ),
 					tr( "Open existing project" ),
 					this, SLOT( openProject() ),
-								m_toolBar );
+								gridButtons_w );
 
 
 	toolButton * project_open_recent = new toolButton( 
 				embed::getIconPixmap( "project_open_recent" ),
 					tr( "Recently opened project" ),
-					this, SLOT( emptySlot() ), m_toolBar );
+					this, SLOT( emptySlot() ), gridButtons_w );
 	project_open_recent->setMenu( m_recentlyOpenedProjectsMenu );
 	project_open_recent->setPopupMode( toolButton::InstantPopup );
 
@@ -358,7 +372,7 @@ void mainWindow::finalize( void )
 					embed::getIconPixmap( "project_save" ),
 					tr( "Save current project" ),
 					this, SLOT( saveProject() ),
-								m_toolBar );
+								gridButtons_w );
 
 
 	toolButton * project_export = new toolButton( 
@@ -366,16 +380,17 @@ void mainWindow::finalize( void )
 					tr( "Export current project" ),
 					engine::getSong(),
 							SLOT( exportProject() ),
-								m_toolBar );
+								gridButtons_w );
 
-
-	m_toolBarLayout->setColumnMinimumWidth( 0, 5 );
-	m_toolBarLayout->addWidget( project_new, 0, 1 );
-	m_toolBarLayout->addWidget( project_new_from_template, 0, 2 );
-	m_toolBarLayout->addWidget( project_open, 0, 3 );
-	m_toolBarLayout->addWidget( project_open_recent, 0, 4 );
-	m_toolBarLayout->addWidget( project_save, 0, 5 );
-	m_toolBarLayout->addWidget( project_export, 0, 6 );
+	gridButtons_layout->setMargin( 0 );
+	gridButtons_layout->setSpacing( 0 );
+	gridButtons_layout->setColumnMinimumWidth( 0, 5 );
+	gridButtons_layout->addWidget( project_new, 0, 1 );
+	gridButtons_layout->addWidget( project_new_from_template, 0, 2 );
+	gridButtons_layout->addWidget( project_open, 0, 3 );
+	gridButtons_layout->addWidget( project_open_recent, 0, 4 );
+	gridButtons_layout->addWidget( project_save, 0, 5 );
+	gridButtons_layout->addWidget( project_export, 0, 6 );
 
 
 
@@ -384,7 +399,7 @@ void mainWindow::finalize( void )
 					embed::getIconPixmap( "songeditor" ),
 					tr( "Show/hide Song-Editor" ) + " (F5)",
 					this, SLOT( toggleSongEditorWin() ),
-								m_toolBar );
+								gridButtons_w );
 	song_editor_window->setShortcut( Qt::Key_F5 );
 	song_editor_window->setWhatsThis(
 		tr( "By pressing this button, you can show or hide the "
@@ -400,7 +415,7 @@ void mainWindow::finalize( void )
 					tr( "Show/hide Beat+Bassline Editor" ) +
 									" (F6)",
 					this, SLOT( toggleBBEditorWin() ),
-								m_toolBar );
+								gridButtons_w );
 	bb_editor_window->setShortcut( Qt::Key_F6 );
 	bb_editor_window->setWhatsThis(
 		tr( "By pressing this button, you can show or hide the "
@@ -416,7 +431,7 @@ void mainWindow::finalize( void )
 						tr( "Show/hide Piano-Roll" ) +
 									" (F7)",
 					this, SLOT( togglePianoRollWin() ),
-								m_toolBar );
+								gridButtons_w );
 	piano_roll_window->setShortcut( Qt::Key_F7 );
 	piano_roll_window->setWhatsThis(
 			tr( "Click here to show or hide the "
@@ -430,7 +445,7 @@ void mainWindow::finalize( void )
 									" (F8)",
 					this,
 					SLOT( toggleAutomationEditorWin() ),
-					m_toolBar );
+					gridButtons_w );
 	automation_editor_window->setShortcut( Qt::Key_F8 );
 	automation_editor_window->setWhatsThis(
 			tr( "Click here to show or hide the "
@@ -443,7 +458,7 @@ void mainWindow::finalize( void )
 					embed::getIconPixmap( "fx_mixer" ),
 					tr( "Show/hide FX Mixer" ) + " (F9)",
 					this, SLOT( toggleFxMixerWin() ),
-					m_toolBar );
+					gridButtons_w );
 	fx_mixer_window->setShortcut( Qt::Key_F9 );
 	fx_mixer_window->setWhatsThis( 
 		tr( "Click here to show or hide the "
@@ -456,7 +471,7 @@ void mainWindow::finalize( void )
 					tr( "Show/hide project notes" ) +
 								" (F10)",
 					this, SLOT( toggleProjectNotesWin() ),
-								m_toolBar );
+								gridButtons_w );
 	project_notes_window->setShortcut( Qt::Key_F10 );
 	project_notes_window->setWhatsThis(
 		tr( "Click here to show or hide the "
@@ -468,19 +483,217 @@ void mainWindow::finalize( void )
 					tr( "Show/hide controller rack" ) +
 								" (F11)",
 					this, SLOT( toggleControllerRack() ),
-								m_toolBar );
+								gridButtons_w );
 	controllers_window->setShortcut( Qt::Key_F11 );
 
-	m_toolBarLayout->addWidget( song_editor_window, 1, 1 );
-	m_toolBarLayout->addWidget( bb_editor_window, 1, 2 );
-	m_toolBarLayout->addWidget( piano_roll_window, 1, 3 );
-	m_toolBarLayout->addWidget( automation_editor_window, 1, 4 );
-	m_toolBarLayout->addWidget( fx_mixer_window, 1, 5 );
-	m_toolBarLayout->addWidget( project_notes_window, 1, 6 );
-	m_toolBarLayout->addWidget( controllers_window, 1, 7 );
-	m_toolBarLayout->addWidget( controllers_window, 1, 7 );
-	m_toolBarLayout->setColumnStretch( 100, 1 );
+	gridButtons_layout->addWidget( song_editor_window, 1, 1 );
+	gridButtons_layout->addWidget( bb_editor_window, 1, 2 );
+	gridButtons_layout->addWidget( piano_roll_window, 1, 3 );
+	gridButtons_layout->addWidget( automation_editor_window, 1, 4 );
+	gridButtons_layout->addWidget( fx_mixer_window, 1, 5 );
+	gridButtons_layout->addWidget( project_notes_window, 1, 6 );
+	gridButtons_layout->addWidget( controllers_window, 1, 7 );
+	gridButtons_layout->addWidget( controllers_window, 1, 7 );
+	gridButtons_layout->setColumnStretch( 100, 1 );
 
+	
+	m_toolBarLayout->addWidget( gridButtons_w, 0, Qt::AlignLeft );
+	
+	m_toolBarLayout->insertSpacing( -1, 10 );
+	
+	// container for tempo/bpm and high quality
+	QWidget * tempo_hq_w = new QWidget( m_toolBar );
+	QVBoxLayout * tempo_hq_layout = new QVBoxLayout( tempo_hq_w );
+	tempo_hq_layout->setMargin( 0 );
+	tempo_hq_layout->setSpacing( 0 );
+	
+	// tempo spin box
+	m_tempoSpinBox = new lcdSpinBox( 3, tempo_hq_w, tr( "Tempo" ) );
+	m_tempoSpinBox->setModel( &( engine::getSong()->m_tempoModel) );
+	m_tempoSpinBox->setLabel( tr( "TEMPO/BPM" ) );
+	toolTip::add( m_tempoSpinBox, tr( "tempo of song" ) );
+
+	m_tempoSpinBox->setWhatsThis(
+		tr( "The tempo of a song is specified in beats per minute "
+			"(BPM). If you want to change the tempo of your "
+			"song, change this value. Every measure has four beats, "
+			"so the tempo in BPM specifies, how many measures / 4 "
+			"should be played within a minute (or how many measures "
+			"should be played within four minutes)." ) );
+
+	tempo_hq_layout->addWidget( m_tempoSpinBox );
+
+	// high quality button
+	toolButton * hq_btn = new toolButton( embed::getIconPixmap( "hq_mode" ),
+						tr( "High quality mode" ),
+						NULL, NULL, tempo_hq_w );
+	hq_btn->setCheckable( TRUE );
+	connect( hq_btn, SIGNAL( toggled( bool ) ),
+			this, SLOT( setHighQuality( bool ) ) );
+	hq_btn->setFixedWidth( 42 );
+	
+	tempo_hq_layout->addWidget( hq_btn );
+
+	// add container to main toolbar
+	m_toolBarLayout->addWidget( tempo_hq_w );
+
+	
+	m_toolBarLayout->insertSpacing( -1, 10 );
+
+	// time signature spin boxes
+	m_timeSigDisplay = new meterDialog( this, TRUE );
+	m_timeSigDisplay->setModel( &( engine::getSong()->m_timeSigModel ) );
+	
+	m_toolBarLayout->addWidget( m_timeSigDisplay, 0, Qt::AlignLeft );
+
+	m_toolBarLayout->insertSpacing( -1, 10 );
+	
+	// master volume slider
+	QLabel * master_vol_lbl = new QLabel( m_toolBar );
+	master_vol_lbl->setPixmap( embed::getIconPixmap( "master_volume" ) );
+
+	m_masterVolumeSlider = new automatableSlider( m_toolBar,
+							tr( "Master volume" ) );
+	m_masterVolumeSlider->setModel( &( engine::getSong()->m_masterVolumeModel ) );
+	m_masterVolumeSlider->setOrientation( Qt::Vertical );
+	m_masterVolumeSlider->setPageStep( 1 );
+	m_masterVolumeSlider->setTickPosition( QSlider::TicksLeft );
+	m_masterVolumeSlider->setFixedSize( 26, 60 );
+	m_masterVolumeSlider->setTickInterval( 50 );
+	toolTip::add( m_masterVolumeSlider, tr( "master volume" ) );
+
+	connect( m_masterVolumeSlider, SIGNAL( logicValueChanged( int ) ), this,
+			SLOT( masterVolumeChanged( int ) ) );
+	connect( m_masterVolumeSlider, SIGNAL( sliderPressed() ), this,
+			SLOT( masterVolumePressed() ) );
+	connect( m_masterVolumeSlider, SIGNAL( logicSliderMoved( int ) ), this,
+			SLOT( masterVolumeMoved( int ) ) );
+	connect( m_masterVolumeSlider, SIGNAL( sliderReleased() ), this,
+			SLOT( masterVolumeReleased() ) );
+
+	m_mvsStatus = new textFloat;
+	m_mvsStatus->setTitle( tr( "Master volume" ) );
+	m_mvsStatus->setPixmap( embed::getIconPixmap( "master_volume" ) );
+
+	m_toolBarLayout->addWidget( master_vol_lbl, 0, Qt::AlignLeft );
+	m_toolBarLayout->addWidget( m_masterVolumeSlider, 0, Qt::AlignLeft );
+
+	m_toolBarLayout->insertSpacing( -1, 10 );
+
+	// master pitch slider
+	QLabel * master_pitch_lbl = new QLabel( m_toolBar );
+	master_pitch_lbl->setPixmap( embed::getIconPixmap( "master_pitch" ) );
+	master_pitch_lbl->setFixedHeight( 64 );
+
+	m_masterPitchSlider = new automatableSlider( m_toolBar, tr( "Master pitch" ) );
+	m_masterPitchSlider->setModel( &( engine::getSong()->m_masterPitchModel ) );
+	m_masterPitchSlider->setOrientation( Qt::Vertical );
+	m_masterPitchSlider->setPageStep( 1 );
+	m_masterPitchSlider->setTickPosition( QSlider::TicksLeft );
+	m_masterPitchSlider->setFixedSize( 26, 60 );
+	m_masterPitchSlider->setTickInterval( 12 );
+	toolTip::add( m_masterPitchSlider, tr( "master pitch" ) );
+	connect( m_masterPitchSlider, SIGNAL( logicValueChanged( int ) ), this,
+			SLOT( masterPitchChanged( int ) ) );
+	connect( m_masterPitchSlider, SIGNAL( sliderPressed() ), this,
+			SLOT( masterPitchPressed() ) );
+	connect( m_masterPitchSlider, SIGNAL( logicSliderMoved( int ) ), this,
+			SLOT( masterPitchMoved( int ) ) );
+	connect( m_masterPitchSlider, SIGNAL( sliderReleased() ), this,
+			SLOT( masterPitchReleased() ) );
+
+	m_mpsStatus = new textFloat;
+	m_mpsStatus->setTitle( tr( "Master pitch" ) );
+	m_mpsStatus->setPixmap( embed::getIconPixmap( "master_pitch" ) );
+
+	m_toolBarLayout->addWidget( master_pitch_lbl, 0, Qt::AlignLeft );
+	m_toolBarLayout->addWidget( m_masterPitchSlider, 0, Qt::AlignLeft );
+
+	m_toolBarLayout->insertSpacing( -1, 10 );
+
+	// box to hold all new controls we're adding to main toolbar
+	//QWidget * add_w = new QWidget( tb );
+	//QHBoxLayout * add_layout = new QHBoxLayout( add_w );
+	
+	// create widget for visualization- and cpu-load-widget
+	QWidget * vc_w = new QWidget( m_toolBar );
+	QVBoxLayout * vcw_layout = new QVBoxLayout( vc_w );
+	vcw_layout->setMargin( 0 );
+	vcw_layout->setSpacing( 0 );
+
+	//vcw_layout->addStretch();
+	vcw_layout->addWidget( new visualizationWidget(
+			embed::getIconPixmap( "output_graph" ), vc_w ) );
+
+	vcw_layout->addWidget( new cpuloadWidget( vc_w ) );
+	vcw_layout->addStretch();
+	
+	m_toolBarLayout->addWidget( vc_w, 0, Qt::AlignLeft );
+	m_toolBarLayout->insertSpacing( -1, 10 );
+	
+	/*// global playback and record controls
+	// main box
+	QWidget * gpbr_w = new QWidget( m_toolBar );
+	QHBoxLayout * gpbrw_layout = new QHBoxLayout( gpbr_w );
+	
+	// playback half
+	QWidget * gpb_w = new QWidget( gpbr_w );
+	QVBoxLayout * gpbw_layout = new QVBoxLayout( gpb_w );
+	gpbw_layout->setMargin( 0 );
+	gpbw_layout->setSpacing( 0 );
+	gpbw_layout->addWidget( new QLabel( tr( "PLAYBACK" ), gpb_w ) );
+	
+	QWidget * btns = new QWidget( gpb_w );
+	QHBoxLayout * btns_layout = new QHBoxLayout( btns );
+	
+	QToolButton * m_playButton = new QToolButton( btns );
+	m_playButton->setIcon( embed::getIconPixmap( "play" ) );
+	m_playButton->setToolTip( tr( "Play/pause the current window (Space)" ) );
+
+	QToolButton * m_recordButton = new QToolButton( btns );
+	m_recordButton->setIcon( embed::getIconPixmap( "record" ) );
+	m_recordButton->setToolTip( tr( "Record from the checked items to the right" ) );
+
+	QToolButton * m_recordAccompanyButton = new QToolButton( btns );
+	m_recordAccompanyButton->setIcon( embed::getIconPixmap( "record_accompany" ) );
+	m_recordAccompanyButton->setToolTip( tr( "Record from the checked items to the right while playing" ) );
+	
+	QToolButton * m_stopButton = new QToolButton( btns );
+	m_stopButton->setIcon( embed::getIconPixmap( "stop" ) );
+	m_stopButton->setToolTip( tr( "Stop playing whatever is playing" ) );
+
+	btns_layout->setMargin(0);
+	btns_layout->setSpacing(0);
+	btns_layout->addWidget( m_playButton );
+	btns_layout->addWidget( m_recordButton );
+	btns_layout->addWidget( m_recordAccompanyButton );
+	btns_layout->addWidget( m_stopButton );
+	
+	gpbw_layout->addWidget( btns );
+	
+	gpbw_layout->addStretch();
+	
+	QWidget * gr_w = new QWidget( gpbr_w );
+	QVBoxLayout * grw_layout = new QVBoxLayout( gr_w );
+	grw_layout->setMargin( 0 );
+	grw_layout->setSpacing( 0 );
+	grw_layout->addWidget( new QLabel( tr( "RECORD" ), gr_w ) );
+	
+	grw_layout->addWidget( new QCheckBox( tr( "Audio-device" ), gr_w ) );
+	grw_layout->addWidget( new QCheckBox( tr( "Automation" ), gr_w ) );
+	grw_layout->addWidget( new QCheckBox( tr( "MIDI" ), gr_w ) ); 
+	
+	
+	gpbrw_layout->setMargin( 0 );
+	gpbrw_layout->setSpacing( 0 );
+	gpbrw_layout->addWidget( gpb_w );
+	gpbrw_layout->addSpacing( 20 );
+	gpbrw_layout->addWidget( gr_w );
+	gpbrw_layout->addStretch();
+	
+	
+	addWidgetToToolBar( gpbr_w );*/
+	
 
 	// setup-dialog opened before?
 	if( !configManager::inst()->value( "app", "configured" ).toInt() )
@@ -501,7 +714,7 @@ void mainWindow::finalize( void )
 
 
 
-
+/*
 int mainWindow::addWidgetToToolBar( QWidget * _w, int _row, int _col )
 {
 	int col = ( _col == -1 ) ? m_toolBarLayout->columnCount() + 7 : _col;
@@ -524,7 +737,7 @@ void mainWindow::addSpacingToToolBar( int _size )
 	m_toolBarLayout->setColumnMinimumWidth( m_toolBarLayout->columnCount() +
 								7, _size );
 }
-
+*/
 
 
 
@@ -1011,6 +1224,99 @@ void mainWindow::browseHelp( void )
 
 
 
+void mainWindow::setHighQuality( bool _hq )
+{
+	engine::getMixer()->changeQuality( mixer::qualitySettings(
+			_hq ? mixer::qualitySettings::Mode_HighQuality :
+				mixer::qualitySettings::Mode_Draft ) );
+}
+
+
+
+void mainWindow::masterVolumeChanged( int _new_val )
+{
+	masterVolumeMoved( _new_val );
+	if( m_mvsStatus->isVisible() == FALSE && engine::getSong()->m_loadingProject == FALSE
+					&& m_masterVolumeSlider->showStatus() )
+	{
+		m_mvsStatus->moveGlobal( m_masterVolumeSlider,
+			QPoint( m_masterVolumeSlider->width() + 2, -2 ) );
+		m_mvsStatus->setVisibilityTimeOut( 1000 );
+	}
+	engine::getMixer()->setMasterGain( _new_val / 100.0f );
+}
+
+
+
+
+void mainWindow::masterVolumePressed( void )
+{
+	m_mvsStatus->moveGlobal( m_masterVolumeSlider,
+			QPoint( m_masterVolumeSlider->width() + 2, -2 ) );
+	m_mvsStatus->show();
+	masterVolumeMoved( engine::getSong()->m_masterVolumeModel.value() );
+}
+
+
+
+
+void mainWindow::masterVolumeMoved( int _new_val )
+{
+	m_mvsStatus->setText( tr( "Value: %1%" ).arg( _new_val ) );
+}
+
+
+
+
+void mainWindow::masterVolumeReleased( void )
+{
+	m_mvsStatus->hide();
+}
+
+
+
+
+void mainWindow::masterPitchChanged( int _new_val )
+{
+	masterPitchMoved( _new_val );
+	if( m_mpsStatus->isVisible() == FALSE && engine::getSong()->m_loadingProject == FALSE
+					&& m_masterPitchSlider->showStatus() )
+	{
+		m_mpsStatus->moveGlobal( m_masterPitchSlider,
+			QPoint( m_masterPitchSlider->width() + 2, -2 ) );
+		m_mpsStatus->setVisibilityTimeOut( 1000 );
+	}
+}
+
+
+
+
+void mainWindow::masterPitchPressed( void )
+{
+	m_mpsStatus->moveGlobal( m_masterPitchSlider,
+			QPoint( m_masterPitchSlider->width() + 2, -2 ) );
+	m_mpsStatus->show();
+	masterPitchMoved( engine::getSong()->m_masterPitchModel.value() );
+}
+
+
+
+
+void mainWindow::masterPitchMoved( int _new_val )
+{
+	m_mpsStatus->setText( tr( "Value: %1 semitones").arg( _new_val ) );
+
+}
+
+
+
+
+void mainWindow::masterPitchReleased( void )
+{
+	m_mpsStatus->hide();
+}
+
+
 #include "moc_main_window.cxx"
 
 
diff --git a/src/gui/song_editor.cpp b/src/gui/song_editor.cpp
index 881c2efbc..979e40c9a 100644
--- a/src/gui/song_editor.cpp
+++ b/src/gui/song_editor.cpp
@@ -33,23 +33,19 @@
 #include <QtGui/QMdiArea>
 #include <QtGui/QPainter>
 #include <QtGui/QScrollBar>
+#include <QtGui/QToolBar>
+#include <QtGui/QSpacerItem>
 
 #include <math.h>
 
 #include "song_editor.h"
-#include "automatable_slider.h"
 #include "combobox.h"
-#include "cpuload_widget.h"
 #include "embed.h"
-#include "lcd_spinbox.h"
 #include "main_window.h"
-#include "meter_dialog.h"
 #include "mmp.h"
-#include "text_float.h"
 #include "timeline.h"
 #include "tool_button.h"
 #include "tooltip.h"
-#include "visualization_widget.h"
 #include "audio_device.h"
 
 
@@ -101,127 +97,6 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) :
 	m_positionLine = new positionLine( this );
 
 
-	// add some essential widgets to global tool-bar 
-	QWidget * tb = engine::getMainWindow()->toolBar();
-
-	engine::getMainWindow()->addSpacingToToolBar( 10 );
-
-	m_tempoSpinBox = new lcdSpinBox( 3, tb, tr( "Tempo" ) );
-	m_tempoSpinBox->setModel( &m_s->m_tempoModel );
-	m_tempoSpinBox->setLabel( tr( "TEMPO/BPM" ) );
-	toolTip::add( m_tempoSpinBox, tr( "tempo of song" ) );
-
-	m_tempoSpinBox->setWhatsThis(
-		tr( "The tempo of a song is specified in beats per minute "
-			"(BPM). If you want to change the tempo of your "
-			"song, change this value. Every measure has four beats, "
-			"so the tempo in BPM specifies, how many measures / 4 "
-			"should be played within a minute (or how many measures "
-			"should be played within four minutes)." ) );
-
-	int col = engine::getMainWindow()->addWidgetToToolBar( m_tempoSpinBox,
-									0 );
-
-
-	toolButton * hq_btn = new toolButton( embed::getIconPixmap( "hq_mode" ),
-						tr( "High quality mode" ),
-						NULL, NULL, tb );
-	hq_btn->setCheckable( TRUE );
-	connect( hq_btn, SIGNAL( toggled( bool ) ),
-			this, SLOT( setHighQuality( bool ) ) );
-	hq_btn->setFixedWidth( 42 );
-	engine::getMainWindow()->addWidgetToToolBar( hq_btn, 1, col );
-
-
-	engine::getMainWindow()->addSpacingToToolBar( 10 );
-
-
-	m_timeSigDisplay = new meterDialog( this, TRUE );
-	m_timeSigDisplay->setModel( &m_s->m_timeSigModel );
-	engine::getMainWindow()->addWidgetToToolBar( m_timeSigDisplay );
-
-	engine::getMainWindow()->addSpacingToToolBar( 10 );
-	
-
-	QLabel * master_vol_lbl = new QLabel( tb );
-	master_vol_lbl->setPixmap( embed::getIconPixmap( "master_volume" ) );
-
-	m_masterVolumeSlider = new automatableSlider( tb,
-							tr( "Master volume" ) );
-	m_masterVolumeSlider->setModel( &m_s->m_masterVolumeModel );
-	m_masterVolumeSlider->setOrientation( Qt::Vertical );
-	m_masterVolumeSlider->setPageStep( 1 );
-	m_masterVolumeSlider->setTickPosition( QSlider::TicksLeft );
-	m_masterVolumeSlider->setFixedSize( 26, 60 );
-	m_masterVolumeSlider->setTickInterval( 50 );
-	toolTip::add( m_masterVolumeSlider, tr( "master volume" ) );
-
-	connect( m_masterVolumeSlider, SIGNAL( logicValueChanged( int ) ), this,
-			SLOT( masterVolumeChanged( int ) ) );
-	connect( m_masterVolumeSlider, SIGNAL( sliderPressed() ), this,
-			SLOT( masterVolumePressed() ) );
-	connect( m_masterVolumeSlider, SIGNAL( logicSliderMoved( int ) ), this,
-			SLOT( masterVolumeMoved( int ) ) );
-	connect( m_masterVolumeSlider, SIGNAL( sliderReleased() ), this,
-			SLOT( masterVolumeReleased() ) );
-
-	m_mvsStatus = new textFloat;
-	m_mvsStatus->setTitle( tr( "Master volume" ) );
-	m_mvsStatus->setPixmap( embed::getIconPixmap( "master_volume" ) );
-
-	engine::getMainWindow()->addWidgetToToolBar( master_vol_lbl );
-	engine::getMainWindow()->addWidgetToToolBar( m_masterVolumeSlider );
-
-
-	engine::getMainWindow()->addSpacingToToolBar( 10 );
-
-
-	QLabel * master_pitch_lbl = new QLabel( tb );
-	master_pitch_lbl->setPixmap( embed::getIconPixmap( "master_pitch" ) );
-	master_pitch_lbl->setFixedHeight( 64 );
-
-	m_masterPitchSlider = new automatableSlider( tb, tr( "Master pitch" ) );
-	m_masterPitchSlider->setModel( &m_s->m_masterPitchModel );
-	m_masterPitchSlider->setOrientation( Qt::Vertical );
-	m_masterPitchSlider->setPageStep( 1 );
-	m_masterPitchSlider->setTickPosition( QSlider::TicksLeft );
-	m_masterPitchSlider->setFixedSize( 26, 60 );
-	m_masterPitchSlider->setTickInterval( 12 );
-	toolTip::add( m_masterPitchSlider, tr( "master pitch" ) );
-	connect( m_masterPitchSlider, SIGNAL( logicValueChanged( int ) ), this,
-			SLOT( masterPitchChanged( int ) ) );
-	connect( m_masterPitchSlider, SIGNAL( sliderPressed() ), this,
-			SLOT( masterPitchPressed() ) );
-	connect( m_masterPitchSlider, SIGNAL( logicSliderMoved( int ) ), this,
-			SLOT( masterPitchMoved( int ) ) );
-	connect( m_masterPitchSlider, SIGNAL( sliderReleased() ), this,
-			SLOT( masterPitchReleased() ) );
-
-	m_mpsStatus = new textFloat;
-	m_mpsStatus->setTitle( tr( "Master pitch" ) );
-	m_mpsStatus->setPixmap( embed::getIconPixmap( "master_pitch" ) );
-
-	engine::getMainWindow()->addWidgetToToolBar( master_pitch_lbl );
-	engine::getMainWindow()->addWidgetToToolBar( m_masterPitchSlider );
-
-	engine::getMainWindow()->addSpacingToToolBar( 10 );
-
-	// create widget for visualization- and cpu-load-widget
-	QWidget * vc_w = new QWidget( tb );
-	QVBoxLayout * vcw_layout = new QVBoxLayout( vc_w );
-	vcw_layout->setMargin( 0 );
-	vcw_layout->setSpacing( 0 );
-
-	//vcw_layout->addStretch();
-	vcw_layout->addWidget( new visualizationWidget(
-			embed::getIconPixmap( "output_graph" ), vc_w ) );
-
-	vcw_layout->addWidget( new cpuloadWidget( vc_w ) );
-	vcw_layout->addStretch();
-
-	engine::getMainWindow()->addWidgetToToolBar( vc_w );
-
-
 	// create own toolbar
 	m_toolBar = new QWidget( this );
 	m_toolBar->setFixedHeight( 32 );
@@ -391,17 +266,6 @@ songEditor::~songEditor()
 
 
 
-
-void songEditor::setHighQuality( bool _hq )
-{
-	engine::getMixer()->changeQuality( mixer::qualitySettings(
-			_hq ? mixer::qualitySettings::Mode_HighQuality :
-				mixer::qualitySettings::Mode_Draft ) );
-}
-
-
-
-
 void songEditor::scrolled( int _new_pos )
 {
 	update();
@@ -557,92 +421,6 @@ void songEditor::wheelEvent( QWheelEvent * _we )
 
 
 
-void songEditor::masterVolumeChanged( int _new_val )
-{
-	masterVolumeMoved( _new_val );
-	if( m_mvsStatus->isVisible() == FALSE && m_s->m_loadingProject == FALSE
-					&& m_masterVolumeSlider->showStatus() )
-	{
-		m_mvsStatus->moveGlobal( m_masterVolumeSlider,
-			QPoint( m_masterVolumeSlider->width() + 2, -2 ) );
-		m_mvsStatus->setVisibilityTimeOut( 1000 );
-	}
-	engine::getMixer()->setMasterGain( _new_val / 100.0f );
-}
-
-
-
-
-void songEditor::masterVolumePressed( void )
-{
-	m_mvsStatus->moveGlobal( m_masterVolumeSlider,
-			QPoint( m_masterVolumeSlider->width() + 2, -2 ) );
-	m_mvsStatus->show();
-	masterVolumeMoved( m_s->m_masterVolumeModel.value() );
-}
-
-
-
-
-void songEditor::masterVolumeMoved( int _new_val )
-{
-	m_mvsStatus->setText( tr( "Value: %1%" ).arg( _new_val ) );
-}
-
-
-
-
-void songEditor::masterVolumeReleased( void )
-{
-	m_mvsStatus->hide();
-}
-
-
-
-
-void songEditor::masterPitchChanged( int _new_val )
-{
-	masterPitchMoved( _new_val );
-	if( m_mpsStatus->isVisible() == FALSE && m_s->m_loadingProject == FALSE
-					&& m_masterPitchSlider->showStatus() )
-	{
-		m_mpsStatus->moveGlobal( m_masterPitchSlider,
-			QPoint( m_masterPitchSlider->width() + 2, -2 ) );
-		m_mpsStatus->setVisibilityTimeOut( 1000 );
-	}
-}
-
-
-
-
-void songEditor::masterPitchPressed( void )
-{
-	m_mpsStatus->moveGlobal( m_masterPitchSlider,
-			QPoint( m_masterPitchSlider->width() + 2, -2 ) );
-	m_mpsStatus->show();
-	masterPitchMoved( m_s->m_masterPitchModel.value() );
-}
-
-
-
-
-void songEditor::masterPitchMoved( int _new_val )
-{
-	m_mpsStatus->setText( tr( "Value: %1 semitones").arg( _new_val ) );
-
-}
-
-
-
-
-void songEditor::masterPitchReleased( void )
-{
-	m_mpsStatus->hide();
-}
-
-
-
-
 void songEditor::updatePosition( const midiTime & _t )
 {
 	if( ( m_s->isPlaying() && m_s->m_playMode == song::Mode_PlaySong ) ||