diff --git a/app/musicmuster.py b/app/musicmuster.py
index 262332a..47a0f50 100755
--- a/app/musicmuster.py
+++ b/app/musicmuster.py
@@ -91,6 +91,7 @@ class Window(QMainWindow, Ui_MainWindow):
         self.actionFade.triggered.connect(self.fade)
         self.actionPlay_next.triggered.connect(self.play_next)
         self.actionSearch_database.triggered.connect(self.search_database)
+        self.actionSkip_next.triggered.connect(self.play_next)
         self.btnPrevious.clicked.connect(self.play_previous)
         self.btnSearchDatabase.clicked.connect(self.search_database)
         self.btnSetNextTrack.clicked.connect(self.set_next_track)
diff --git a/app/playlists.py b/app/playlists.py
index cb04c5d..a4f8e3b 100644
--- a/app/playlists.py
+++ b/app/playlists.py
@@ -432,43 +432,54 @@ class Playlist(QTableWidget):
         notes = self.meta_get_notes()
 
         # Set colours and start times
-        previous_end = None
+        running_end_time = None
         for row in range(self.rowCount()):
+
             if row == current:
                 self.set_row_colour(
                     row, QColor(Config.COLOUR_CURRENT_PLAYLIST)
                 )
-                previous_end = datetime.strptime(self.item(
+                running_end_time = datetime.strptime(self.item(
                     row, self.COL_ENDTIME).text(), "%H:%M:%S")
                 self.set_row_bold(row)
+
             elif row == next:
                 self.set_row_colour(
                     row, QColor(Config.COLOUR_NEXT_PLAYLIST)
                 )
-                if previous_end:
-                    previous_end = self.get_row_endtime(row, previous_end)
-                    item = QTableWidgetItem(previous_end.strftime("%H:%M:%S"))
+                if running_end_time:
+                    running_end_time = self.get_row_endtime(
+                        row, running_end_time)
+                    item = QTableWidgetItem(
+                        running_end_time.strftime("%H:%M:%S"))
                     self.setItem(row, self.COL_ENDTIME, item)
                 self.set_row_bold(row)
+
             elif row in notes:
                 self.set_row_colour(
                     row, QColor(Config.COLOUR_NOTES_PLAYLIST)
                 )
                 self.set_row_bold(row)
+
             else:
+                # Stripe rows
                 if row % 2:
                     colour = QColor(Config.COLOUR_ODD_PLAYLIST)
                 else:
                     colour = QColor(Config.COLOUR_EVEN_PLAYLIST)
                 self.set_row_colour(row, colour)
+
+                # Add running end time
                 if self.item(row, self.COL_INDEX):
                     if int(self.item(row, self.COL_INDEX).text()) > 0:
-                        if previous_end:
-                            previous_end = self.get_row_endtime(
-                                row, previous_end)
+                        if running_end_time:
+                            running_end_time = self.get_row_endtime(
+                                row, running_end_time)
                             item = QTableWidgetItem(
-                                previous_end.strftime("%H:%M:%S"))
+                                running_end_time.strftime("%H:%M:%S"))
                             self.setItem(row, self.COL_ENDTIME, item)
+
+                        # Dim played tracks
                         track_id = int(self.item(row, self.COL_INDEX).text())
                         if track_id in self.played_tracks:
                             self.set_row_not_bold(row)
diff --git a/app/ui/main_window.ui b/app/ui/main_window.ui
index 3f6771a..97027b9 100644
--- a/app/ui/main_window.ui
+++ b/app/ui/main_window.ui
@@ -688,12 +688,12 @@ border: 1px solid rgb(85, 87, 83);</string>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="btnTrackInfo">
+           <widget class="QPushButton" name="btnInsertNote">
             <property name="enabled">
-             <bool>false</bool>
+             <bool>true</bool>
             </property>
             <property name="text">
-             <string>Track &amp;info</string>
+             <string>Insert no&amp;te</string>
             </property>
            </widget>
           </item>
@@ -766,6 +766,9 @@ border: 1px solid rgb(85, 87, 83);</string>
    <property name="text">
     <string>Skip to &amp;next</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+Return</string>
+   </property>
   </action>
   <action name="actionSearch_database">
    <property name="icon">