diff --git a/src/libtomahawk/widgets/SocialPlaylistWidget.cpp b/src/libtomahawk/widgets/SocialPlaylistWidget.cpp
index 86877acde..ea45f1aec 100644
--- a/src/libtomahawk/widgets/SocialPlaylistWidget.cpp
+++ b/src/libtomahawk/widgets/SocialPlaylistWidget.cpp
@@ -29,6 +29,7 @@
 #include "widgets/overlaywidget.h"
 
 using namespace Tomahawk;
+
 QString SocialPlaylistWidget::s_popularAlbumsQuery = "SELECT * from album";
 QString SocialPlaylistWidget::s_mostPlayedPlaylistsQuery = "asd";
 QString SocialPlaylistWidget::s_topForeignTracksQuery = "select track.name, artist.name, count(*) as counter from (select track from playback_log group by track, source), track, artist where track not in (select track from playback_log where source is null group by track) and track.id = track and artist.id = track.artist group by track order by counter desc";
@@ -41,9 +42,6 @@ SocialPlaylistWidget::SocialPlaylistWidget ( QWidget* parent )
 {
     ui->setupUi( this );
 
-
-    ui->splitter->setHandleWidth( 1 );
-    ui->splitter_2->setHandleWidth( 1 );
     ui->splitter_2->setStretchFactor( 0, 2 );
     ui->splitter_2->setStretchFactor( 0, 1 );
 
@@ -92,11 +90,13 @@ SocialPlaylistWidget::SocialPlaylistWidget ( QWidget* parent )
     fetchFromDB();
 }
 
+
 SocialPlaylistWidget::~SocialPlaylistWidget()
 {
 
 }
 
+
 void
 SocialPlaylistWidget::fetchFromDB()
 {
@@ -120,6 +120,8 @@ SocialPlaylistWidget::playlistInterface() const
 {
     return 0;
 }
+
+
 /*
 void
 SocialPlaylistWidget::createPlaylist()
@@ -135,6 +137,7 @@ SocialPlaylistWidget::createPlaylist()
     connect( m_coolQuery1.data(), SIGNAL( created() ), this, SLOT( playlist1Created() ) );
 }*/
 
+
 void
 SocialPlaylistWidget::popularAlbumsFetched( QList< album_ptr > albums )
 {
@@ -143,6 +146,7 @@ SocialPlaylistWidget::popularAlbumsFetched( QList< album_ptr > albums )
     m_popularNewAlbumsModel->addAlbums( albums );
 }
 
+
 void
 SocialPlaylistWidget::topForeignTracksFetched( QList< query_ptr > tracks )
 {
diff --git a/src/libtomahawk/widgets/SocialPlaylistWidget.ui b/src/libtomahawk/widgets/SocialPlaylistWidget.ui
index 91a99dc6c..7943a6369 100644
--- a/src/libtomahawk/widgets/SocialPlaylistWidget.ui
+++ b/src/libtomahawk/widgets/SocialPlaylistWidget.ui
@@ -16,10 +16,16 @@
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
+     <property name="handleWidth">
+      <number>1</number>
+     </property>
      <widget class="QSplitter" name="splitter">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
+      <property name="handleWidth">
+       <number>1</number>
+      </property>
       <widget class="QWidget" name="layoutWidget1">
        <layout class="QVBoxLayout" name="verticalLayout">
         <item>
diff --git a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui
index c06d89099..c9fd466ae 100644
--- a/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui
+++ b/src/libtomahawk/widgets/infowidgets/AlbumInfoWidget.ui
@@ -15,21 +15,29 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
-    <widget class="ArtistView" name="tracksView"/>
-   </item>
-   <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <widget class="HeaderLabel" name="albumsLabel">
-       <property name="text">
-        <string>Other Albums by Artist</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="AlbumView" name="albumsView"/>
-     </item>
-    </layout>
+    <widget class="QSplitter" name="splitter">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="handleWidth">
+      <number>1</number>
+     </property>
+     <widget class="ArtistView" name="tracksView"/>
+     <widget class="QWidget" name="">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="HeaderLabel" name="albumsLabel">
+         <property name="text">
+          <string>Other Albums by Artist</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="AlbumView" name="albumsView"/>
+       </item>
+      </layout>
+     </widget>
+    </widget>
    </item>
   </layout>
  </widget>
diff --git a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui
index c14bd8525..aa6b45159 100644
--- a/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui
+++ b/src/libtomahawk/widgets/infowidgets/ArtistInfoWidget.ui
@@ -13,70 +13,75 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4" stretch="3,3">
-   <property name="margin">
-    <number>4</number>
-   </property>
+  <layout class="QVBoxLayout" name="verticalLayout_4">
    <item>
-    <widget class="QSplitter" name="splitter">
+    <widget class="QSplitter" name="splitter_2">
      <property name="orientation">
-      <enum>Qt::Horizontal</enum>
+      <enum>Qt::Vertical</enum>
      </property>
      <property name="handleWidth">
       <number>1</number>
      </property>
-     <widget class="QWidget" name="layoutWidget">
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="HeaderLabel" name="label">
-         <property name="text">
-          <string>Top Hits</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="PlaylistView" name="topHits">
-         <property name="headerHidden">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
+     <widget class="QSplitter" name="splitter">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+      <property name="handleWidth">
+       <number>1</number>
+      </property>
+      <widget class="QWidget" name="layoutWidget">
+       <layout class="QVBoxLayout" name="verticalLayout_2">
+        <item>
+         <widget class="HeaderLabel" name="label">
+          <property name="text">
+           <string>Top Hits</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="PlaylistView" name="topHits">
+          <property name="headerHidden">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QWidget" name="layoutWidget1">
+       <layout class="QVBoxLayout" name="verticalLayout_3">
+        <item>
+         <widget class="HeaderLabel" name="label_2">
+          <property name="text">
+           <string>Related Artists</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="ArtistView" name="relatedArtists">
+          <property name="headerHidden">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
      </widget>
-     <widget class="QWidget" name="layoutWidget1">
-      <layout class="QVBoxLayout" name="verticalLayout_3">
+     <widget class="QWidget" name="">
+      <layout class="QVBoxLayout" name="verticalLayout">
        <item>
-        <widget class="HeaderLabel" name="label_2">
+        <widget class="HeaderLabel" name="label_3">
          <property name="text">
-          <string>Related Artists</string>
+          <string>Albums</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="ArtistView" name="relatedArtists">
-         <property name="headerHidden">
-          <bool>true</bool>
-         </property>
-        </widget>
+        <widget class="ArtistView" name="albums"/>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
-   <item>
-    <layout class="QVBoxLayout" name="verticalLayout">
-     <item>
-      <widget class="HeaderLabel" name="label_3">
-       <property name="text">
-        <string>Albums</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="ArtistView" name="albums"/>
-     </item>
-    </layout>
-   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/src/libtomahawk/widgets/welcomewidget.cpp b/src/libtomahawk/widgets/welcomewidget.cpp
index 3bf514d61..0c85db4cd 100644
--- a/src/libtomahawk/widgets/welcomewidget.cpp
+++ b/src/libtomahawk/widgets/welcomewidget.cpp
@@ -48,8 +48,6 @@ WelcomeWidget::WelcomeWidget( QWidget* parent )
 {
     ui->setupUi( this );
 
-    ui->splitter->setHandleWidth( 1 );
-    ui->splitter_2->setHandleWidth( 1 );
     ui->splitter_2->setStretchFactor( 0, 2 );
     ui->splitter_2->setStretchFactor( 0, 1 );
 
diff --git a/src/libtomahawk/widgets/welcomewidget.ui b/src/libtomahawk/widgets/welcomewidget.ui
index 58cfeda28..142c2a120 100644
--- a/src/libtomahawk/widgets/welcomewidget.ui
+++ b/src/libtomahawk/widgets/welcomewidget.ui
@@ -16,10 +16,16 @@
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
+     <property name="handleWidth">
+      <number>1</number>
+     </property>
      <widget class="QSplitter" name="splitter">
       <property name="orientation">
        <enum>Qt::Vertical</enum>
       </property>
+      <property name="handleWidth">
+       <number>1</number>
+      </property>
       <widget class="QWidget" name="layoutWidget1">
        <layout class="QVBoxLayout" name="verticalLayout">
         <item>
diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp
index 51c6c0542..1be3d343f 100644
--- a/src/tomahawkwindow.cpp
+++ b/src/tomahawkwindow.cpp
@@ -234,7 +234,6 @@ TomahawkWindow::setupSideBar()
     ui->splitter->setStretchFactor( 0, 1 );
     ui->splitter->setStretchFactor( 1, 3 );
     ui->splitter->setCollapsible( 1, false );
-    ui->splitter->setHandleWidth( 1 );
 
     ui->actionShowOfflineSources->setChecked( TomahawkSettings::instance()->showOfflineSources() );
 }