diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp
index b8a54d76a..37d58fd82 100644
--- a/src/core/mainwindow.cpp
+++ b/src/core/mainwindow.cpp
@@ -215,7 +215,7 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
 
   ui_->multi_loading_indicator->SetTaskManager(app_->task_manager());
   status_view_->SetApplication(app_);
-  ui_->now_playing->SetApplication(app_);
+  ui_->widget_playing->SetApplication(app_);
 
   int volume = app_->player()->GetVolume();
   ui_->volume->setValue(volume);
@@ -233,8 +233,8 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
   ui_->tabs->addTab(tidal_search_view_, IconLoader::Load("tidal"), tr("Tidal", "Tidal"));
   //ui_->tabs->AddSpacer();
 
-  // Add the now playing widget to the fancy tab widget
-  ui_->tabs->addBottomWidget(ui_->now_playing);
+  // Add the playing widget to the fancy tab widget
+  ui_->tabs->addBottomWidget(ui_->widget_playing);
 
   //ui_->tabs->SetBackgroundPixmap(QPixmap(":/pictures/strawberry-background.png"));
 
@@ -608,11 +608,11 @@ MainWindow::MainWindow(Application *app, SystemTrayIcon *tray_icon, OSD *osd, co
 
   ui_->track_slider->SetApplication(app);
 
-  // Now playing widget
-  qLog(Debug) << "Creating now playing widget";
-  ui_->now_playing->set_ideal_height(ui_->status_bar->sizeHint().height() + ui_->player_controls->sizeHint().height());
-  connect(app_->player(), SIGNAL(Stopped()), ui_->now_playing, SLOT(Stopped()));
-  //connect(ui_->now_playing, SIGNAL(ShowAboveStatusBarChanged(bool)), SLOT(PlayingWidgetPositionChanged(bool)));
+  // Playing widget
+  qLog(Debug) << "Creating playing widget";
+  ui_->widget_playing->set_ideal_height(ui_->status_bar->sizeHint().height() + ui_->player_controls->sizeHint().height());
+  connect(app_->player(), SIGNAL(Stopped()), ui_->widget_playing, SLOT(Stopped()));
+  //connect(ui_->widget_playing, SIGNAL(ShowAboveStatusBarChanged(bool)), SLOT(PlayingWidgetPositionChanged(bool)));
   connect(ui_->action_console, SIGNAL(triggered()), SLOT(ShowConsole()));
   PlayingWidgetPositionChanged();
 
@@ -858,9 +858,9 @@ void MainWindow::resizeEvent(QResizeEvent*) { SaveGeometry(); }
 void MainWindow::TabSwitched() {
   
   if (ui_->tabs->currentIndex() > 0)
-    ui_->now_playing->SetEnabled();
+    ui_->widget_playing->SetEnabled();
   else
-    ui_->now_playing->SetDisabled();
+    ui_->widget_playing->SetDisabled();
 
   SaveGeometry();
 
diff --git a/src/core/mainwindow.ui b/src/core/mainwindow.ui
index 7772f70ed..21985d849 100644
--- a/src/core/mainwindow.ui
+++ b/src/core/mainwindow.ui
@@ -40,7 +40,7 @@
        <enum>Qt::Horizontal</enum>
       </property>
       <widget class="QWidget" name="sidebar_layout">
-       <layout class="QVBoxLayout" name="verticalLayout_4">
+       <layout class="QVBoxLayout" name="layout_left">
         <property name="spacing">
          <number>0</number>
         </property>
@@ -48,12 +48,12 @@
          <widget class="FancyTabWidget" name="tabs" native="true"/>
         </item>
         <item>
-         <widget class="PlayingWidget" name="now_playing" native="true"/>
+         <widget class="PlayingWidget" name="widget_playing" native="true"/>
         </item>
        </layout>
       </widget>
       <widget class="QWidget" name="playlist_layout">
-       <layout class="QVBoxLayout" name="verticalLayout_7">
+       <layout class="QVBoxLayout" name="layout_right">
         <property name="spacing">
          <number>0</number>
         </property>
@@ -70,7 +70,7 @@
          </widget>
         </item>
         <item>
-         <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <layout class="QHBoxLayout" name="layout_bottom">
           <property name="spacing">
            <number>0</number>
           </property>
diff --git a/src/device/deviceviewcontainer.cpp b/src/device/deviceviewcontainer.cpp
index b92ee84ed..0ddad6169 100644
--- a/src/device/deviceviewcontainer.cpp
+++ b/src/device/deviceviewcontainer.cpp
@@ -20,6 +20,7 @@
 
 #include "config.h"
 
+#include <QtGlobal>
 #include <QWidget>
 #include <QColor>
 #include <QFrame>