diff --git a/src/ui/audio/AudioWidget.cpp b/src/ui/audio/AudioWidget.cpp
index 3d395785..c83838f8 100644
--- a/src/ui/audio/AudioWidget.cpp
+++ b/src/ui/audio/AudioWidget.cpp
@@ -80,7 +80,7 @@ _mediaPlayer(nullptr)
 		cb->addItem("metal");
 		cb->addItem("rock");
 		cb->addItem("top50");
-		cb->setWidth(100);
+		cb->setWidth(75);
 
 		playlistControls->addWidget(cb, 1);
 		playlistControls->addWidget(new Wt::WPushButton("Rename"));
@@ -89,7 +89,8 @@ _mediaPlayer(nullptr)
 
 		playlist->addLayout(playlistControls);
 
-		playlist->addWidget( new TableFilter(_db, "release", "name"), 1);
+		// TODO
+		playlist->addWidget( new Wt::WTableView(), 1);
 
 		mainLayout->addLayout(playlist, 0, 1, 2, 1);
 	}
@@ -97,13 +98,16 @@ _mediaPlayer(nullptr)
 	_mediaPlayer = new AudioMediaPlayerWidget();
 	mainLayout->addWidget(_mediaPlayer, 2, 0, 1, 2);
 
-	mainLayout->setColumnStretch(0, 1);
 	mainLayout->setRowStretch(1, 1);
 	mainLayout->setRowResizable(0, true, Wt::WLength(200, Wt::WLength::Pixel));
 	mainLayout->setColumnResizable(0, true);
 
-	_mediaPlayer->playbackEnded().connect(this, &AudioWidget::handleTrackEnded);
 	trackView->trackSelected().connect(boost::bind(&AudioWidget::playTrack, this, _1));
+
+	_mediaPlayer->playbackEnded().connect(std::bind([=] ()
+	{
+		trackView->selectNextTrack();
+	}));
 }
 
 void
@@ -147,11 +151,5 @@ AudioWidget::playTrack(boost::filesystem::path p)
 	}
 }
 
-void
-AudioWidget::handleTrackEnded(void)
-{
-	LMS_LOG(MOD_UI, SEV_DEBUG) << "Track playback ended!";
-}
-
 } // namespace UserInterface
 
diff --git a/src/ui/audio/AudioWidget.hpp b/src/ui/audio/AudioWidget.hpp
index 1f922d8c..503b2d53 100644
--- a/src/ui/audio/AudioWidget.hpp
+++ b/src/ui/audio/AudioWidget.hpp
@@ -45,8 +45,6 @@ class AudioWidget : public Wt::WContainerWidget
 
 		void playTrack(boost::filesystem::path p);
 
-		void handleTrackEnded(void);
-
 		Database::Handler&	_db;
 
 		AudioMediaPlayerWidget*	_mediaPlayer;