diff --git a/src/drivers/Qt/TasEditor/TasEditorWindow.cpp b/src/drivers/Qt/TasEditor/TasEditorWindow.cpp
index 97eaeddd..adc753d3 100644
--- a/src/drivers/Qt/TasEditor/TasEditorWindow.cpp
+++ b/src/drivers/Qt/TasEditor/TasEditorWindow.cpp
@@ -235,6 +235,7 @@ void TasEditorWindow::buildSideControlPanel(void)
 {
 	QVBoxLayout *vbox;
 	QHBoxLayout *hbox;
+	QGridLayout *grid;
 
 	ctlPanelMainVbox = new QVBoxLayout();
 
@@ -261,11 +262,34 @@ void TasEditorWindow::buildSideControlPanel(void)
 	   turboSeekCbox = new QCheckBox( tr("Turbo Seek") );
 	 autoRestoreCbox = new QCheckBox( tr("Auto-Restore Last Position") );
 
+	recRecordingCbox   = new QCheckBox( tr("Recording") );
+	recSuperImposeCbox = new QCheckBox( tr("Superimpose") );
+	recUsePatternCbox  = new QCheckBox( tr("Use Pattern") );
+	recAllBtn          = new QRadioButton( tr("All") );
+	rec1PBtn           = new QRadioButton( tr("1P") );
+	rec2PBtn           = new QRadioButton( tr("2P") );
+	rec3PBtn           = new QRadioButton( tr("3P") );
+	rec4PBtn           = new QRadioButton( tr("4P") );
+
+	selectionLbl = new QLabel( tr("Empty") );
+	clipboardLbl = new QLabel( tr("Empty") );
+
 	runLuaBtn   = new QPushButton( tr("Run Function") );
 	autoLuaCBox = new QCheckBox( tr("Auto Function") );
 	runLuaBtn->setEnabled(false);
 	autoLuaCBox->setChecked(true);
 
+	bkbrTree = new QTreeWidget();
+	histTree = new QTreeWidget();
+
+	prevMkrBtn = new QPushButton();
+	nextMkrBtn = new QPushButton();
+	similarBtn = new QPushButton( tr("Similar") );
+	moreBtn    = new QPushButton( tr("More") );
+
+	prevMkrBtn->setIcon( style()->standardIcon( QStyle::SP_MediaSkipBackward ) );
+	nextMkrBtn->setIcon( style()->standardIcon( QStyle::SP_MediaSkipForward  ) );
+
 	vbox = new QVBoxLayout();
 	hbox = new QHBoxLayout();
 	vbox->addLayout( hbox );
@@ -284,11 +308,37 @@ void TasEditorWindow::buildSideControlPanel(void)
 
 	playbackGBox->setLayout( vbox );
 
+	grid = new QGridLayout();
+	grid->addWidget( recRecordingCbox, 0, 0, 1, 2 );
+	grid->addWidget( recAllBtn       , 0, 3, 1, 1 );
+	grid->addWidget( rec1PBtn        , 1, 0, 1, 1 );
+	grid->addWidget( rec2PBtn        , 1, 1, 1, 1 );
+	grid->addWidget( rec3PBtn        , 1, 2, 1, 1 );
+	grid->addWidget( rec4PBtn        , 1, 3, 1, 1 );
+	grid->addWidget( recSuperImposeCbox, 2, 0, 1, 2 );
+	grid->addWidget( recUsePatternCbox , 2, 2, 1, 2 );
+	recorderGBox->setLayout( grid );
+
+	grid = new QGridLayout();
+	grid->addWidget( new QLabel( tr("Selection:") ), 0, 0, 1, 1 );
+	grid->addWidget( new QLabel( tr("Clipboard:") ), 1, 0, 1, 1 );
+	grid->addWidget( selectionLbl, 0, 1, 1, 3 );
+	grid->addWidget( clipboardLbl, 1, 1, 1, 3 );
+	splicerGBox->setLayout( grid );
+
 	hbox = new QHBoxLayout();
 	hbox->addWidget( runLuaBtn );
 	hbox->addWidget( autoLuaCBox );
 	luaGBox->setLayout( hbox );
 
+	vbox = new QVBoxLayout();
+	vbox->addWidget( bkbrTree );
+	bookmarksGBox->setLayout( vbox );
+
+	vbox = new QVBoxLayout();
+	vbox->addWidget( histTree );
+	historyGBox->setLayout( vbox );
+
 	ctlPanelMainVbox->addWidget( playbackGBox  );
 	ctlPanelMainVbox->addWidget( recorderGBox  );
 	ctlPanelMainVbox->addWidget( splicerGBox   );
@@ -296,6 +346,13 @@ void TasEditorWindow::buildSideControlPanel(void)
 	ctlPanelMainVbox->addWidget( bookmarksGBox );
 	ctlPanelMainVbox->addWidget( historyGBox   );
 
+	hbox = new QHBoxLayout();
+	hbox->addWidget( prevMkrBtn );
+	hbox->addWidget( similarBtn );
+	hbox->addWidget( moreBtn    );
+	hbox->addWidget( nextMkrBtn );
+	ctlPanelMainVbox->addLayout( hbox );
+
 	controlPanelContainerWidget = new QWidget();
 	controlPanelContainerWidget->setLayout( ctlPanelMainVbox );
 }
diff --git a/src/drivers/Qt/TasEditor/TasEditorWindow.h b/src/drivers/Qt/TasEditor/TasEditorWindow.h
index 4e7984c8..eccbb134 100644
--- a/src/drivers/Qt/TasEditor/TasEditorWindow.h
+++ b/src/drivers/Qt/TasEditor/TasEditorWindow.h
@@ -15,6 +15,7 @@
 #include <QComboBox>
 #include <QCheckBox>
 #include <QPushButton>
+#include <QRadioButton>
 #include <QLineEdit>
 #include <QLabel>
 #include <QFrame>
@@ -108,8 +109,28 @@ class TasEditorWindow : public QDialog
 		QCheckBox   *turboSeekCbox;
 		QCheckBox   *autoRestoreCbox;
 
+		QCheckBox    *recRecordingCbox;
+		QCheckBox    *recSuperImposeCbox;
+		QCheckBox    *recUsePatternCbox;
+		QRadioButton *recAllBtn;
+		QRadioButton *rec1PBtn;
+		QRadioButton *rec2PBtn;
+		QRadioButton *rec3PBtn;
+		QRadioButton *rec4PBtn;
+
+		QLabel      *selectionLbl;
+		QLabel      *clipboardLbl;
+
 		QPushButton *runLuaBtn;
 		QCheckBox   *autoLuaCBox;
+
+		QTreeWidget *bkbrTree;
+		QTreeWidget *histTree;
+
+		QPushButton *prevMkrBtn;
+		QPushButton *nextMkrBtn;
+		QPushButton *similarBtn;
+		QPushButton *moreBtn;
 	private:
 
 	public slots: