diff --git a/public/index.html b/public/index.html
index 7693176..f55602f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -416,17 +416,23 @@ <h2><span v-if="metadata">{{ metadata }}</span><span v-if="release_date">{{ rele
 								</tr>
 							</thead>
 							<tbody>
-								<tr v-for="track in body">
-									<td><i class="material-icons">play_arrow</i></td>
-									<td>{{ track.track_position }}</td>
-									<td><i v-if="track.explicit_lyrics" class="material-icons">explicit</i>{{ track.title }} <span v-if="track.title_version">{{track.title_version}}</span></td>
-									<td>{{ track.artist.name }}</td>
-									<td>{{ convertDuration(track.duration) }}</td>
-									<td><input class="trackCheckbox" type="checkbox" v-model="track.selected"></td>
-								</tr>
+								<template v-for="track in body">
+									<tr v-if="track.type == 'track'">
+										<td><i class="material-icons">play_arrow</i></td>
+										<td>{{ track.track_position }}</td>
+										<td><i v-if="track.explicit_lyrics" class="material-icons">explicit</i>{{ track.title }} <span v-if="track.title_version">{{track.title_version}}</span></td>
+										<td>{{ track.artist.name }}</td>
+										<td>{{ convertDuration(track.duration) }}</td>
+										<td><input class="trackCheckbox" type="checkbox" v-model="track.selected"></td>
+									</tr>
+									<tr v-if="track.type == 'disc_separator'">
+										<td colspan="6" style="opacity: 0.54;"><i class="material-icons">album</i>{{ track.number }}</td>
+									</tr>
+								</template>
+
 							</tbody>
 						</table>
-
+						<span v-if="label" style="opacity: 0.40;margin-top: 8px;display: inline-block;font-size: 13px;">{{ label }}</span>
 						<footer>
 							<button v-bind:data-link="link">Download {{ type }}</button>
 							<button>Download selection<i class="material-icons right">file_download</i></button>
diff --git a/public/js/app/tabs.js b/public/js/app/tabs.js
index a669509..5ac7cc7 100644
--- a/public/js/app/tabs.js
+++ b/public/js/app/tabs.js
@@ -23,7 +23,7 @@ function changeTab(evt, section, tabName) {
 	document.getElementById(tabName).style.display = 'block'
 	window[section + '_selected'] = tabName
 
-	// Not choosing .currentTarget beacuse the event 
+	// Not choosing .currentTarget beacuse the event
 	// is delegated, so it refers to #sidebar
 	evt.target.classList.add('active')
 
@@ -37,9 +37,9 @@ function changeTab(evt, section, tabName) {
 	}
 }
 
-function showTab(type, id) {
+function showTab(type, id, back=false) {
 	if (windows_stack.length == 0) windows_stack.push({ tab: main_selected })
-	else windows_stack.push(currentStack)
+	else if (!back) windows_stack.push(currentStack)
 	if (type == 'artist') tab = 'artist_tab'
 	else tab = 'tracklist_tab'
 	currentStack = { type: type, id: id }
@@ -55,7 +55,7 @@ function backTab() {
 		clickElement('main_' + main_selected + 'link')
 	} else {
 		let tabObj = windows_stack.pop()
-		showTab(tabObj.type, tabObj.id)
+		showTab(tabObj.type, tabObj.id, true)
 	}
 }