diff --git a/app/ui/main_window.ui b/app/ui/main_window.ui
index 3ebe59f..753d0c7 100644
--- a/app/ui/main_window.ui
+++ b/app/ui/main_window.ui
@@ -134,9 +134,15 @@ border: 1px solid rgb(85, 87, 83);</string>
        <layout class="QVBoxLayout" name="verticalLayout">
         <item>
          <widget class="QLabel" name="hdrPreviousTrack">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="minimumSize">
            <size>
-            <width>16</width>
+            <width>0</width>
             <height>0</height>
            </size>
           </property>
@@ -160,12 +166,18 @@ border: 1px solid rgb(85, 87, 83);</string>
            <string/>
           </property>
           <property name="wordWrap">
-           <bool>true</bool>
+           <bool>false</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QPushButton" name="hdrCurrentTrack">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="font">
            <font>
             <pointsize>20</pointsize>
@@ -174,7 +186,9 @@ border: 1px solid rgb(85, 87, 83);</string>
           <property name="styleSheet">
            <string notr="true">background-color: #d4edda;
 border: 1px solid rgb(85, 87, 83);
-text-align: left;</string>
+text-align: left;
+padding-left: 8px;
+</string>
           </property>
           <property name="text">
            <string/>
@@ -186,6 +200,12 @@ text-align: left;</string>
         </item>
         <item>
          <widget class="QPushButton" name="hdrNextTrack">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="font">
            <font>
             <pointsize>20</pointsize>
@@ -194,7 +214,8 @@ text-align: left;</string>
           <property name="styleSheet">
            <string notr="true">background-color: #fff3cd;
 border: 1px solid rgb(85, 87, 83);
-text-align: left;</string>
+text-align: left;
+padding-left: 8px;</string>
           </property>
           <property name="text">
            <string/>
diff --git a/app/ui/main_window_ui.py b/app/ui/main_window_ui.py
index ef90819..cd812ce 100644
--- a/app/ui/main_window_ui.py
+++ b/app/ui/main_window_ui.py
@@ -80,7 +80,12 @@ class Ui_MainWindow(object):
         self.verticalLayout = QtWidgets.QVBoxLayout()
         self.verticalLayout.setObjectName("verticalLayout")
         self.hdrPreviousTrack = QtWidgets.QLabel(self.centralwidget)
-        self.hdrPreviousTrack.setMinimumSize(QtCore.QSize(16, 0))
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.hdrPreviousTrack.sizePolicy().hasHeightForWidth())
+        self.hdrPreviousTrack.setSizePolicy(sizePolicy)
+        self.hdrPreviousTrack.setMinimumSize(QtCore.QSize(0, 0))
         self.hdrPreviousTrack.setMaximumSize(QtCore.QSize(16777215, 16777215))
         font = QtGui.QFont()
         font.setFamily("Sans")
@@ -89,27 +94,40 @@ class Ui_MainWindow(object):
         self.hdrPreviousTrack.setStyleSheet("background-color: #f8d7da;\n"
 "border: 1px solid rgb(85, 87, 83);")
         self.hdrPreviousTrack.setText("")
-        self.hdrPreviousTrack.setWordWrap(True)
+        self.hdrPreviousTrack.setWordWrap(False)
         self.hdrPreviousTrack.setObjectName("hdrPreviousTrack")
         self.verticalLayout.addWidget(self.hdrPreviousTrack)
         self.hdrCurrentTrack = QtWidgets.QPushButton(self.centralwidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.hdrCurrentTrack.sizePolicy().hasHeightForWidth())
+        self.hdrCurrentTrack.setSizePolicy(sizePolicy)
         font = QtGui.QFont()
         font.setPointSize(20)
         self.hdrCurrentTrack.setFont(font)
         self.hdrCurrentTrack.setStyleSheet("background-color: #d4edda;\n"
 "border: 1px solid rgb(85, 87, 83);\n"
-"text-align: left;")
+"text-align: left;\n"
+"padding-left: 8px;\n"
+"")
         self.hdrCurrentTrack.setText("")
         self.hdrCurrentTrack.setFlat(True)
         self.hdrCurrentTrack.setObjectName("hdrCurrentTrack")
         self.verticalLayout.addWidget(self.hdrCurrentTrack)
         self.hdrNextTrack = QtWidgets.QPushButton(self.centralwidget)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.hdrNextTrack.sizePolicy().hasHeightForWidth())
+        self.hdrNextTrack.setSizePolicy(sizePolicy)
         font = QtGui.QFont()
         font.setPointSize(20)
         self.hdrNextTrack.setFont(font)
         self.hdrNextTrack.setStyleSheet("background-color: #fff3cd;\n"
 "border: 1px solid rgb(85, 87, 83);\n"
-"text-align: left;")
+"text-align: left;\n"
+"padding-left: 8px;")
         self.hdrNextTrack.setText("")
         self.hdrNextTrack.setFlat(True)
         self.hdrNextTrack.setObjectName("hdrNextTrack")