diff --git a/config/config.inc.php b/config/config.inc.php
index 5d4ec2b..0665306 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -18,4 +18,8 @@
 
 	$_CONFIG['sort_by_tracknumber'] = true;
 
+	$_CONFIG['browse_extra_track_info'] = false;
+
+	$_CONFIG['playlist_extra_track_info'] = true;
+
 ?>
diff --git a/lib/page.php b/lib/page.php
index 2ea78a2..579aebe 100644
--- a/lib/page.php
+++ b/lib/page.php
@@ -12,13 +12,15 @@
 			echo '</pre>';
 			//*/
 
+			$smarty->assign('show_extra_track_info', $_CONFIG['playlist_extra_track_info']);
+
 			$smarty->assign('playlist', $mympd->playlist);
 			$smarty->assign('playing', $mympd->current_track_id);
 			break;
 		case "control":
 			/* get the currently playing track */
 			$current_track = $mympd->playlist[$mympd->current_track_id];
-			$smarty->assign('current_track_no', $current_track['Track']);
+			$smarty->assign('current_track_no', $mympd->current_track_id);
 			$smarty->assign('current_title', $current_track['Title']);
 			$smarty->assign('current_album', $current_track['Album']);
 			$smarty->assign('current_artist', $current_track['Artist']);
@@ -26,6 +28,8 @@
 			break;
 		case "browse":
 
+			$smarty->assign('show_extra_track_info', $_CONFIG['show_extra_track_info']);
+
 			switch ($_CONFIG['browse_mode']) {
 
 				case 'metadata': /* metadata based browsing.  this will list artists->albums->tracks */
diff --git a/templates/default/browselist_item.html b/templates/default/browselist_item.html
index 8b8334f..e461e11 100644
--- a/templates/default/browselist_item.html
+++ b/templates/default/browselist_item.html
@@ -13,6 +13,6 @@
 
 				{elseif $browselist_item.Title}
 
-				{if $browselist_item.in_playlist}<li class="playing">{else}<li>{/if}<a href="{$browselist_add_link}{$browselist_item.file|escape:'url'}"><img src="images/add.gif" alt="Add" class="button" /></a><a href="{$browselist_play_link}{$browselist_item.file|escape:'url'}"><img src="images/play.gif" alt="Play" class="button" /></a><img src="images/note.gif" class="icon" /> {if $browselist_item.Title|escape:'html'}<span class="title">{$browselist_item.Title|escape:'html'}</span><br /><span class="artist">{$browselist_item.Artist|escape:'html'}</span> <span class="album">({$browselist_item.Album|escape:'html'})</span>{else}{$browselist_item.file|escape:'html'}{/if}</li>
+				{if $browselist_item.in_playlist}<li class="playing">{else}<li>{/if}<a href="{$browselist_add_link}{$browselist_item.file|escape:'url'}"><img src="images/add.gif" alt="Add" class="button" /></a><a href="{$browselist_play_link}{$browselist_item.file|escape:'url'}"><img src="images/play.gif" alt="Play" class="button" /></a><img src="images/note.gif" class="icon" /> {if $browselist_item.Title|escape:'html'}<span class="title">{$browselist_item.Title|escape:'html'}</span>{if $browselist_item.Artist && $show_extra_track_info}<br /><span class="artist">{$browselist_item.Artist|escape:'html'}</span> {if $browselist_item.Album}<span class="album">({$browselist_item.Album|escape:'html'})</span>{/if}{/if}{else}{$browselist_item.file|escape:'html'}{/if}</li>
 
 				{/if}
diff --git a/templates/default/control.html b/templates/default/control.html
index 79d4033..4c6df1c 100644
--- a/templates/default/control.html
+++ b/templates/default/control.html
@@ -1,3 +1,3 @@
-		<div id="song_display">{if $current_artist && $current_title}<span class="pos">{$current_track_no|string_format:"%02d"}.</span> <span class="title">{$current_title}</span><br /><span class="artist">{$current_artist}</span> <span class="album">({$current_album})</span>{elseif $current_file}{$current_file}{else}<br />[Nothing playing]{/if}</div>
+		<div id="song_display">{if $current_title}<span class="pos">{$current_track_no+1|string_format:"%02d"}.</span> <span class="title">{$current_title}</span><br /><span class="artist">{$current_artist}</span> {if $current_album}<span class="album">({$current_album})</span>{/if}{elseif $current_file}{$current_file}{else}<br />[Nothing playing]{/if}</div>
 
 		<div id="controls"><a href="index.php?action=prev"><img src="images/prev_button.gif" Alt="Previous" /></a><a href="index.php?action=play"><img src="images/play_button.gif" Alt="Play" /></a><a href="index.php?action=pause"><img src="images/pause_button.gif" Alt="Pause" /></a><a href="index.php?action=stop"><img src="images/stop_button.gif" Alt="Stop" /></a><a href="index.php?action=next"><img src="images/next_button.gif" Alt="Next" /></a></div>
diff --git a/templates/default/playlist_item.html b/templates/default/playlist_item.html
index 10fab1c..4b2c4e0 100644
--- a/templates/default/playlist_item.html
+++ b/templates/default/playlist_item.html
@@ -1 +1 @@
-				{if $playlist_item.Pos == $playing}<li class="playing">{else}<li>{/if}<a href="{$playlist_remove_link}{$playlist_item.Pos}"><img src="images/del.gif" alt="Remove from Playlist" class="button" /></a><a href="{$playlist_play_link}{$playlist_item.Pos}"><img src="images/play.gif" alt="Play" class="button" /></a><img src="images/note.gif" class="icon" /> <span class="pos">{$playlist_item.Pos+1|string_format:"%02d"}.</span> {if $playlist_item.Title}<span class="title">{$playlist_item.Title}</span><br /><span class="artist">{$playlist_item.Artist}</span> <span class="album">({$playlist_item.Album})</span>{else}{$playlist_item.file}{/if}</li>
+				{if $playlist_item.Pos == $playing}<li class="playing">{else}<li>{/if}<a href="{$playlist_remove_link}{$playlist_item.Pos}"><img src="images/del.gif" alt="Remove from Playlist" class="button" /></a><a href="{$playlist_play_link}{$playlist_item.Pos}"><img src="images/play.gif" alt="Play" class="button" /></a><img src="images/note.gif" class="icon" /> <span class="pos">{$playlist_item.Pos+1|string_format:"%02d"}.</span> {if $playlist_item.Title}<span class="title">{$playlist_item.Title}</span>{if $playlist_item.Artist && $show_extra_track_info}<br /><span class="artist">{$playlist_item.Artist}</span> {if $playlist_item.Album}<span class="album">({$playlist_item.Album})</span>{/if}{/if}{else}{$playlist_item.file}{/if}</li>