diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 5f763dbd2b..f71c6682d2 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -210,6 +210,7 @@ bool dbg_audio_thread(void)
 extern size_t audiobuffer_free;
 extern int codecbuflen;
 extern int codecbufused;
+extern int track_count;
 
 static int ticks, boost_ticks;
 
@@ -248,23 +249,26 @@ bool dbg_audio_thread(void)
         
         lcd_clear_display();
 
-        snprintf(buf, sizeof(buf), "pcm buf: %d/%d",
+        snprintf(buf, sizeof(buf), "pcm: %d/%d",
                  PCMBUF_SIZE-(int)audiobuffer_free, PCMBUF_SIZE);
         lcd_puts(0, line++, buf);
 
         /* Playable space left */
-        scrollbar(0, line*8, LCD_WIDTH, 4, PCMBUF_SIZE, 0, 
+        scrollbar(0, line*8, LCD_WIDTH, 6, PCMBUF_SIZE, 0, 
                   PCMBUF_SIZE-audiobuffer_free, HORIZONTAL);
         line++;
 
-        snprintf(buf, sizeof(buf), "codec buf: %d/%d", codecbufused, codecbuflen);
+        snprintf(buf, sizeof(buf), "codec: %d/%d", codecbufused, codecbuflen);
         lcd_puts(0, line++, buf);
 
         /* Playable space left */
-        scrollbar(0, line*8, LCD_WIDTH, 4, codecbuflen, 0, 
+        scrollbar(0, line*8, LCD_WIDTH, 6, codecbuflen, 0, 
                   codecbufused, HORIZONTAL);
         line++;
 
+        snprintf(buf, sizeof(buf), "track count: %d", track_count);
+        lcd_puts(0, line++, buf);
+
         snprintf(buf, sizeof(buf), "cpu freq: %dMHz", (int)FREQ/1000000+1);
         lcd_puts(0, line++, buf);
 
diff --git a/apps/playback.c b/apps/playback.c
index 3bd4ff69dd..500f44e45b 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -135,7 +135,7 @@ static int last_peek_offset;
 
 /* Track information (count in file buffer, read/write indexes for
    track ring structure. */
-static int track_count;
+int track_count;
 static volatile int track_ridx;
 static volatile int track_widx;
 static bool track_changed;