diff --git a/website/artist.html b/website/artist.html
index 7546f66..8626ea9 100644
--- a/website/artist.html
+++ b/website/artist.html
@@ -13,7 +13,7 @@
 					<div style="background-image:url('KEY_IMAGEURL')"></div>
 				</td>
 				<td class="text">
-					<h1>KEY_ARTISTNAME</h1> <span class="rank"><a href="/topartists?max=100">KEY_POSITION</a></span><br/>
+					<h1>KEY_ARTISTNAME</h1> <span class="rank"><a href="/charts_artists?max=100">KEY_POSITION</a></span><br/>
 					<span>KEY_ASSOCIATED</span>
 					<p class="stats"><a href="/scrobbles?artist=KEY_ENC_ARTISTNAME">KEY_SCROBBLES Scrobbles</a></p>
 
@@ -22,9 +22,9 @@
 			</tr>
 		</table>
 
-		<h2><a href='/toptracks?artist=KEY_ENC_ARTISTNAME'>Top Tracks</a></h2>
+		<h2><a href='/charts_tracks?artist=KEY_ENC_ARTISTNAME'>Top Tracks</a></h2>
 		KEY_TRACKLIST
-		
+
 
 		<h2><a href='/pulse?artist=KEY_ENC_ARTISTNAME&step=year&trail=1'>Pulse</a></h2>
 		KEY_PULSE
diff --git a/website/topartists.html b/website/charts_artists.html
similarity index 79%
rename from website/topartists.html
rename to website/charts_artists.html
index 0c26e24..3548f84 100644
--- a/website/topartists.html
+++ b/website/charts_artists.html
@@ -3,7 +3,7 @@
 <html>
 	<head>
 		<meta charset="UTF-8" />
-		<title>Maloja - Top Artists</title>
+		<title>Maloja - Artist Charts</title>
 		<script src="javascript/datechange.js"></script>
 	</head>
 
@@ -14,7 +14,7 @@
 					<div style="background-image:url('KEY_TOPARTIST_IMAGEURL')"></div>
 				</td>
 				<td class="text">
-					<h1>Top Artists</h1><br/>
+					<h1>Artist Charts</h1><a href="/top_artists"><span>View #1 Artists</span></a><br/>
 					<span>KEY_RANGE</span>
 					<!--<p class="stats">KEY_SCROBBLES Scrobbles</p>-->
 					<br/><br/>
diff --git a/website/topartists.py b/website/charts_artists.py
similarity index 100%
rename from website/topartists.py
rename to website/charts_artists.py
diff --git a/website/toptracks.html b/website/charts_tracks.html
similarity index 77%
rename from website/toptracks.html
rename to website/charts_tracks.html
index a5f39a4..594b552 100644
--- a/website/toptracks.html
+++ b/website/charts_tracks.html
@@ -3,7 +3,7 @@
 <html>
 	<head>
 		<meta charset="UTF-8" />
-		<title>Maloja - Top Tracks</title>
+		<title>Maloja - Track Charts</title>
 	</head>
 
 	<body>
@@ -13,7 +13,7 @@
 					<div style="background-image:url('KEY_TOPARTIST_IMAGEURL')"></div>
 				</td>
 				<td class="text">
-					<h1>Top Tracks</h1><br/>
+					<h1>Track Charts</h1><a href="/top_tracks"><span>View #1 Tracks</span></a><br/>
 					<span>KEY_LIMITS</span>
 					<!--<p class="stats">KEY_SCROBBLES Scrobbles</p>-->
 					<br/><br/>
diff --git a/website/toptracks.py b/website/charts_tracks.py
similarity index 100%
rename from website/toptracks.py
rename to website/charts_tracks.py
diff --git a/website/start.html b/website/start.html
index 166ce5e..ace69b0 100644
--- a/website/start.html
+++ b/website/start.html
@@ -32,7 +32,7 @@
    		</div>-->
 
 
-		<h1><a href="/topartists?max=50">Top Artists</a></h1>
+		<h1><a href="/charts_artists?max=50">Top Artists</a></h1>
 		<!--All Time | This Year | This Month | This Week-->
 
 
@@ -52,7 +52,7 @@
 
 
 
-		<h1><a href="/toptracks?max=50">Top Tracks</a></h1>
+		<h1><a href="/charts_tracks?max=50">Top Tracks</a></h1>
 
 
 		<span onclick="showRange('toptracks','week')" class="stat_selector_toptracks" id="selector_toptracks_week">This Week</span>
diff --git a/website/chartsartists.html b/website/top_artists.html
similarity index 84%
rename from website/chartsartists.html
rename to website/top_artists.html
index 3ec5bea..d8153e2 100644
--- a/website/chartsartists.html
+++ b/website/top_artists.html
@@ -3,7 +3,7 @@
 <html>
 	<head>
 		<meta charset="UTF-8" />
-		<title>Maloja - Favorite Artists</title>
+		<title>Maloja - #1 Artists</title>
 	</head>
 
 	<body>
@@ -13,7 +13,7 @@
 					<div style="background-image:url('KEY_TOPARTIST_IMAGEURL')"></div>
 				</td>
 				<td class="text">
-					<h1>Favorite Artists</h1><br/>
+					<h1>#1 Artists</h1><br/>
 					<span>KEY_LIMITS</span>
 					<!--<p class="stats">KEY_SCROBBLES Scrobbles</p>-->
 					<br/><br/>
diff --git a/website/chartsartists.py b/website/top_artists.py
similarity index 100%
rename from website/chartsartists.py
rename to website/top_artists.py
diff --git a/website/chartstracks.html b/website/top_tracks.html
similarity index 84%
rename from website/chartstracks.html
rename to website/top_tracks.html
index e74211b..0657695 100644
--- a/website/chartstracks.html
+++ b/website/top_tracks.html
@@ -3,7 +3,7 @@
 <html>
 	<head>
 		<meta charset="UTF-8" />
-		<title>Maloja - Favorite Tracks</title>
+		<title>Maloja - #1 Tracks</title>
 	</head>
 
 	<body>
@@ -13,7 +13,7 @@
 					<div style="background-image:url('KEY_TOPTRACK_IMAGEURL')"></div>
 				</td>
 				<td class="text">
-					<h1>Favorite Tracks</h1><br/>
+					<h1>#1 Tracks</h1><br/>
 					<span>KEY_LIMITS</span>
 					<!--<p class="stats">KEY_SCROBBLES Scrobbles</p>-->
 					<br/><br/>
diff --git a/website/chartstracks.py b/website/top_tracks.py
similarity index 100%
rename from website/chartstracks.py
rename to website/top_tracks.py
diff --git a/website/track.html b/website/track.html
index 79cca09..520ed6a 100644
--- a/website/track.html
+++ b/website/track.html
@@ -14,7 +14,7 @@
 				</td>
 				<td class="text">
 					<span>KEY_ARTISTS</span><br/>
-					<h1>KEY_TRACKTITLE</h1> <span class="rank"><a href="/toptracks?max=100">KEY_POSITION</a></span>
+					<h1>KEY_TRACKTITLE</h1> <span class="rank"><a href="/charts_tracks?max=100">KEY_POSITION</a></span>
 
 					<p class="stats"><a href="/scrobbles?KEY_SCROBBLELINK">KEY_SCROBBLES Scrobbles</a></p>
 
