diff --git a/maloja/web/jinja/album.jinja b/maloja/web/jinja/album.jinja
index 4a6f855..6a16da3 100644
--- a/maloja/web/jinja/album.jinja
+++ b/maloja/web/jinja/album.jinja
@@ -76,6 +76,15 @@
 	</tr>
 </table>
 
+<h2><a href='{{ mlj_uri.create_uri("/charts_tracks",filterkeys) }}'>Top Tracks</a></h2>
+
+
+{% with amountkeys={"perpage":15,"page":0} %}
+{% include 'partials/charts_tracks.jinja' %}
+{% endwith %}
+
+<br/>
+
 
 <table class="twopart">
 
diff --git a/maloja/web/jinja/artist.jinja b/maloja/web/jinja/artist.jinja
index acac7b1..6f3b635 100644
--- a/maloja/web/jinja/artist.jinja
+++ b/maloja/web/jinja/artist.jinja
@@ -90,8 +90,14 @@
 </table>
 
 
-<h2><a href='{{ mlj_uri.create_uri("/charts_tracks",filterkeys) }}'>Top Tracks</a></h2>
+<h2><a href='{{ mlj_uri.create_uri("/charts_albums",filterkeys) }}'>Top Albums</a></h2>
 
+{% with amountkeys={"perpage":15,"page":0} %}
+{% include 'partials/charts_albums.jinja' %}
+{% endwith %}
+
+
+<h2><a href='{{ mlj_uri.create_uri("/charts_tracks",filterkeys) }}'>Top Tracks</a></h2>
 
 {% with amountkeys={"perpage":15,"page":0} %}
 {% include 'partials/charts_tracks.jinja' %}
diff --git a/maloja/web/jinja/track.jinja b/maloja/web/jinja/track.jinja
index 29cb404..3fbc909 100644
--- a/maloja/web/jinja/track.jinja
+++ b/maloja/web/jinja/track.jinja
@@ -64,6 +64,9 @@
 				{{ awards.certs(track) }}
 				<span class="rank"><a href="/charts_tracks?max=100">#{{ info.position }}</a></span>
 				<br/>
+				{% if info.track.album %}
+				from {{ links.link(info.track.album) }}<br/>
+				{% endif %}
 
 			<p class="stats">
 				{% if adminmode %}<button type="button" onclick="scrobble('{{ encodedtrack }}')">Scrobble now</button>{% endif %}