diff --git a/ChangeLog b/ChangeLog
index a0066801a..fc79cc2db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2009-02-12      Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
 
+	* include/group_box.h:
+	* src/gui/widgets/effect_rack_view.cpp:
+	backport: manage effectRackView with a QVBoxLayout
+
+	* src/gui/widgets/controller_rack_view.cpp:
+	* src/gui/widgets/effect_rack_view.cpp:
+	backport: prevent Horizontal bars from appearing in some cases
+
+	* cmake/modules/Win32Toolchain.cmake:
+	reflect recent changes to MinGW cross compiling environment
+
 	* plugins/sf2_player/sf2_player.cpp:
 	update patch after loading settings (closes #2486372)
 
diff --git a/include/group_box.h b/include/group_box.h
index a77e1250e..f506b5b2c 100644
--- a/include/group_box.h
+++ b/include/group_box.h
@@ -39,7 +39,7 @@ class groupBox : public QWidget, public boolModelView
 {
 	Q_OBJECT
 public:
-	groupBox( const QString & _caption, QWidget * _parent );
+	groupBox( const QString & _caption, QWidget * _parent = NULL );
 	virtual ~groupBox();
 
 	virtual void modelChanged( void );
diff --git a/src/gui/widgets/controller_rack_view.cpp b/src/gui/widgets/controller_rack_view.cpp
index 558dcec8a..6f3b08aeb 100644
--- a/src/gui/widgets/controller_rack_view.cpp
+++ b/src/gui/widgets/controller_rack_view.cpp
@@ -52,6 +52,7 @@ controllerRackView::controllerRackView( ) :
 	m_scrollArea = new QScrollArea( this );
 	m_scrollArea->setFixedSize( 230, 184 );
 	m_scrollArea->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn );
+	m_scrollArea->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
 	m_scrollArea->setPalette( QApplication::palette( m_scrollArea ) );
 	m_scrollArea->move( 6, 22 );
 
diff --git a/src/gui/widgets/effect_rack_view.cpp b/src/gui/widgets/effect_rack_view.cpp
index 2c20f71e3..0fb2ae5c6 100644
--- a/src/gui/widgets/effect_rack_view.cpp
+++ b/src/gui/widgets/effect_rack_view.cpp
@@ -45,13 +45,19 @@ effectRackView::effectRackView( effectChain * _model, QWidget * _parent ) :
 	setAttribute( Qt::WA_OpaquePaintEvent, true );
 	setFixedSize( 250, 250 );
 
-	m_effectsGroupBox = new groupBox( tr( "EFFECTS CHAIN" ), this );
-	m_effectsGroupBox->setGeometry( 4, 5, 242, 240 );
+	m_mainLayout = new QVBoxLayout( this );
+	m_mainLayout->setSpacing( 0 );
+	m_mainLayout->setMargin( 5 );
+
+	m_effectsGroupBox = new groupBox( tr( "EFFECTS CHAIN" ) );
+	m_mainLayout->addWidget( m_effectsGroupBox );
 
 	m_scrollArea = new QScrollArea( m_effectsGroupBox );
 	m_scrollArea->setFixedSize( 230, 184 );
 	m_scrollArea->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOn );
+	m_scrollArea->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
 	m_scrollArea->setPalette( QApplication::palette( m_scrollArea ) );
+	m_scrollArea->setWidget( new QWidget );
 	m_scrollArea->move( 6, 22 );
 
 	QPushButton * addButton = new QPushButton( m_effectsGroupBox );
@@ -59,8 +65,6 @@ effectRackView::effectRackView( effectChain * _model, QWidget * _parent ) :
 	addButton->move( 8, 210 );
 	connect( addButton, SIGNAL( clicked() ), this, SLOT( addEffect() ) );
 
-	QWidget * w = new QWidget;
-	m_scrollArea->setWidget( w );
 
 	m_lastY = 0;