diff --git a/data/themes/default/controller_bg.png b/data/themes/default/controller_bg.png
index cfb6e729a..dc9c9f011 100644
Binary files a/data/themes/default/controller_bg.png and b/data/themes/default/controller_bg.png differ
diff --git a/data/themes/default/style.css b/data/themes/default/style.css
index 134a76a2c..7a365ea9f 100644
--- a/data/themes/default/style.css
+++ b/data/themes/default/style.css
@@ -38,7 +38,7 @@ QMenu::item {
 QMenu::item:selected {
 	color: white;
 	font-weight:bold;
-	background-color: rgba(0, 0, 0, 160);
+	background-color: rgb(54,57,66);
 	margin:3px;
 }
 
diff --git a/include/controller_view.h b/include/controller_view.h
index 68e6e227f..512f8c6e2 100644
--- a/include/controller_view.h
+++ b/include/controller_view.h
@@ -77,6 +77,7 @@ signals:
 protected:
 	virtual void contextMenuEvent( QContextMenuEvent * _me );
 	virtual void paintEvent( QPaintEvent * _pe );
+    virtual void mouseDoubleClickEvent( QMouseEvent * event );
 	virtual void modelChanged( void );
 
 
diff --git a/src/core/controller.cpp b/src/core/controller.cpp
index dbe6099ee..a5383d5f7 100644
--- a/src/core/controller.cpp
+++ b/src/core/controller.cpp
@@ -49,7 +49,11 @@ controller::controller( ControllerTypes _type, model * _parent ) :
 	m_type( _type )
 {
 	if( _type != DummyController )
+	{
 		s_controllers.append( this );
+		m_name = QString( tr( "Controller %1" ) )
+				.arg( s_controllers.size() );
+	}
 }
 
 
@@ -186,7 +190,7 @@ void controller::loadSettings( const QDomElement & _this )
 							"settings-node!\n" );
 	}
 
-	setName( _this.attribute( "muted" ) );
+	setName( _this.attribute( "name" ) );
 }
 
 
diff --git a/src/gui/lfo_controller_dialog.cpp b/src/gui/lfo_controller_dialog.cpp
index 113b28a03..6af042b5d 100644
--- a/src/gui/lfo_controller_dialog.cpp
+++ b/src/gui/lfo_controller_dialog.cpp
@@ -65,8 +65,12 @@ const int LFO_PHASE_KNOB_X = LFO_AMOUNT_KNOB_X+KNOB_X_SPACING;
 lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent ) :
 	controllerDialog( _model, _parent )
 {
-	setWindowIcon( embed::getIconPixmap( "controller" ) );
+	QString title = tr( "LFO" );
+	title.append( " (" );
+	title.append( _model->name() );
+	title.append( ")" );
 	setWindowTitle( tr( "LFO (name)" ) );
+	setWindowIcon( embed::getIconPixmap( "controller" ) );
 	setFixedSize( 256, 64 );
 	
 	toolTip::add( this, tr( "LFO Controller" ) );
diff --git a/src/gui/widgets/controller_rack_view.cpp b/src/gui/widgets/controller_rack_view.cpp
index 6f657d3ec..8f1f0266d 100644
--- a/src/gui/widgets/controller_rack_view.cpp
+++ b/src/gui/widgets/controller_rack_view.cpp
@@ -182,11 +182,11 @@ void controllerRackView::update( void )
 	{
 		controllerView * v = new controllerView( s->m_controllers[i], w );
 		m_controllerViews.append( v );
-		v->move( 0, i*20 );
+		v->move( 0, i*32 );
 		v->show();
 	}
 
-	w->setFixedSize( 210, i*20 );
+	w->setFixedSize( 210, i*32 );
 
 	/*
 	for( QVector<effect *>::iterator it = fxChain()->m_effects.begin();