diff --git a/malojatime.py b/malojatime.py
index d789b8c..98c635f 100644
--- a/malojatime.py
+++ b/malojatime.py
@@ -391,6 +391,7 @@ def time_fix(t):
 	if isinstance(t,MRangeDescriptor): return t
 
 	if isinstance(t, str):
+		if t in ["alltime"]: return None
 		tod = datetime.datetime.utcnow()
 		months = ["january","february","march","april","may","june","july","august","september","october","november","december"]
 		weekdays = ["sunday","monday","tuesday","wednesday","thursday","friday","saturday"]
diff --git a/settings/default.ini b/settings/default.ini
index b6661ab..9999031 100644
--- a/settings/default.ini
+++ b/settings/default.ini
@@ -27,8 +27,8 @@ LOCAL_IMAGE_ROTATE = 3600	# when multiple images are present locally, how many s
 DEFAULT_RANGE_CHARTS_ARTISTS = year
 DEFAULT_RANGE_CHARTS_TRACKS = year
 # same for pulse view
-# can be days, weeks, months, years
-DEFAULT_RANGE_PULSE = months
+# can be day, week, month, year
+DEFAULT_STEP_PULSE = month
 
 [Fluff]
 
diff --git a/website/artist.html b/website/artist.html
index 82f3449..7853411 100644
--- a/website/artist.html
+++ b/website/artist.html
@@ -33,35 +33,35 @@
 		<table class="twopart">
 			<tr>
 				<td>
-					<h2><a href='/pulse?artist=KEY_ENC_ARTISTNAME&step=year&trail=1'>Pulse</a></h2>
+					<h2><a class="stat_link_pulse" href='/pulse?artist=KEY_ENC_ARTISTNAME&trail=1&step=month'>Pulse</a></h2>
 
 
-					<span onclick="showRangeManual('pulse','days')" class="stat_selector_pulse selector_pulse_days">7 days</span>
-		      			| <span onclick="showRangeManual('pulse','weeks')" class="stat_selector_pulse selector_pulse_weeks">12 weeks</span>
-		      			| <span onclick="showRangeManual('pulse','months')" class="stat_selector_pulse selector_pulse_months" style="opacity:0.5;">12 months</span>
-		      			| <span onclick="showRangeManual('pulse','years')" class="stat_selector_pulse selector_pulse_years">10 years</span>
+					<span onclick="showRangeManual('pulse','day')" class="stat_selector_pulse selector_pulse_day">7 days</span>
+		      			| <span onclick="showRangeManual('pulse','week')" class="stat_selector_pulse selector_pulse_week">12 weeks</span>
+		      			| <span onclick="showRangeManual('pulse','month')" class="stat_selector_pulse selector_pulse_month" style="opacity:0.5;">12 months</span>
+		      			| <span onclick="showRangeManual('pulse','year')" class="stat_selector_pulse selector_pulse_year">10 years</span>
 
 		      			<br/><br/>
 
-		      			<span class="stat_module_pulse pulse_months">KEY_PULSE_MONTHS</span>
-		      			<span class="stat_module_pulse pulse_days" style="display:none;">KEY_PULSE_DAYS</span>
-		      			<span class="stat_module_pulse pulse_years" style="display:none;">KEY_PULSE_YEARS</span>
-		      			<span class="stat_module_pulse pulse_weeks" style="display:none;">KEY_PULSE_WEEKS</span>
+		      			<span class="stat_module_pulse pulse_month">KEY_PULSE_MONTHS</span>
+		      			<span class="stat_module_pulse pulse_day" style="display:none;">KEY_PULSE_DAYS</span>
+		      			<span class="stat_module_pulse pulse_year" style="display:none;">KEY_PULSE_YEARS</span>
+		      			<span class="stat_module_pulse pulse_week" style="display:none;">KEY_PULSE_WEEKS</span>
 				</td>
 				<td>
 					<!-- We use the same classes / function calls here because we want it to switch together with pulse -->
-					<h2><a href='/performance?artist=KEY_ENC_CREDITEDARTISTNAME&step=year&trail=1'>Performance</a></h2>
-					<span onclick="showRangeManual('pulse','days')" class="stat_selector_pulse selector_pulse_days">7 days</span>
-		      			| <span onclick="showRangeManual('pulse','weeks')" class="stat_selector_pulse selector_pulse_weeks">12 weeks</span>
-		      			| <span onclick="showRangeManual('pulse','months')" class="stat_selector_pulse selector_pulse_months" style="opacity:0.5;">12 months</span>
-		      			| <span onclick="showRangeManual('pulse','years')" class="stat_selector_pulse selector_pulse_years">10 years</span>
+					<h2><a class="stat_link_pulse" href='/performance?artist=KEY_ENC_CREDITEDARTISTNAME&trail=1&step=month'>Performance</a></h2>
+					<span onclick="showRangeManual('pulse','day')" class="stat_selector_pulse selector_pulse_day">7 days</span>
+		      			| <span onclick="showRangeManual('pulse','week')" class="stat_selector_pulse selector_pulse_week">12 weeks</span>
+		      			| <span onclick="showRangeManual('pulse','month')" class="stat_selector_pulse selector_pulse_month" style="opacity:0.5;">12 months</span>
+		      			| <span onclick="showRangeManual('pulse','year')" class="stat_selector_pulse selector_pulse_year">10 years</span>
 
 		      			<br/><br/>
 
-		      			<span class="stat_module_pulse pulse_months">KEY_PERFORMANCE_MONTHS</span>
-		      			<span class="stat_module_pulse pulse_days" style="display:none;">KEY_PERFORMANCE_DAYS</span>
-		      			<span class="stat_module_pulse pulse_years" style="display:none;">KEY_PERFORMANCE_YEARS</span>
-		      			<span class="stat_module_pulse pulse_weeks" style="display:none;">KEY_PERFORMANCE_WEEKS</span>
+		      			<span class="stat_module_pulse pulse_month">KEY_PERFORMANCE_MONTHS</span>
+		      			<span class="stat_module_pulse pulse_day" style="display:none;">KEY_PERFORMANCE_DAYS</span>
+		      			<span class="stat_module_pulse pulse_year" style="display:none;">KEY_PERFORMANCE_YEARS</span>
+		      			<span class="stat_module_pulse pulse_week" style="display:none;">KEY_PERFORMANCE_WEEKS</span>
 				</td>
 			</tr>
 		</table>
diff --git a/website/javascript/rangeselect.js b/website/javascript/rangeselect.js
index 4ea4eed..7720cc6 100644
--- a/website/javascript/rangeselect.js
+++ b/website/javascript/rangeselect.js
@@ -1,29 +1,37 @@
 function showRange(identifier,unit) {
 	// Make all modules disappear
-	modules = document.getElementsByClassName("stat_module_" + identifier)
+	modules = document.getElementsByClassName("stat_module_" + identifier);
 	for (var i=0;i<modules.length;i++) {
 		//modules[i].setAttribute("style","width:0px;overflow:hidden;")
 		// cheesy trick to make the allocated space always whatever the biggest module needs
 		// somehow that messes up pulse on the start page tho
-		modules[i].setAttribute("style","display:none;")
+		modules[i].setAttribute("style","display:none;");
 	}
 
 	// Make requested module appear
-	reactivate = document.getElementsByClassName(identifier + "_" + unit)
+	reactivate = document.getElementsByClassName(identifier + "_" + unit);
 	for (var i=0;i<reactivate.length;i++) {
-		reactivate[i].setAttribute("style","")
+		reactivate[i].setAttribute("style","");
 	}
 
 	// Set all selectors to unselected
-	selectors = document.getElementsByClassName("stat_selector_" + identifier)
+	selectors = document.getElementsByClassName("stat_selector_" + identifier);
 	for (var i=0;i<selectors.length;i++) {
-		selectors[i].setAttribute("style","")
+		selectors[i].setAttribute("style","");
 	}
 
 	// Set the active selector to selected
-	reactivate = document.getElementsByClassName("selector_" + identifier + "_" + unit)
+	reactivate = document.getElementsByClassName("selector_" + identifier + "_" + unit);
 	for (var i=0;i<reactivate.length;i++) {
-		reactivate[i].setAttribute("style","opacity:0.5;")
+		reactivate[i].setAttribute("style","opacity:0.5;");
+	}
+
+	links = document.getElementsByClassName("stat_link_" + identifier);
+	for (let l of links) {
+		var a = l.href.split("=");
+		a.splice(-1);
+		a.push(unit);
+		l.href = a.join("=");
 	}
 
 }
diff --git a/website/start.html b/website/start.html
index 43ec20c..926aaf7 100644
--- a/website/start.html
+++ b/website/start.html
@@ -20,7 +20,7 @@
    		</div>-->
 
 
-		<h1><a href="/charts_artists?max=50">Top Artists</a></h1>
+		<h1><a class="stat_link_topartists" href="/charts_artists?max=50&in=alltime">Top Artists</a></h1>
 		<!--All Time | This Year | This Month | This Week-->
 
 
@@ -40,7 +40,7 @@
 
 
 
-		<h1><a href="/charts_tracks?max=50">Top Tracks</a></h1>
+		<h1><a class="stat_link_toptracks" href="/charts_tracks?max=50&in=alltime">Top Tracks</a></h1>
 
 
 		<span onclick="showRange('toptracks','week')" class="stat_selector_toptracks selector_toptracks_week">This Week</span>
@@ -75,7 +75,7 @@
       			<br/>
 
 
-      			<h1><a href="/pulse?step=month&trail=1">Pulse</a></h1>
+      			<h1><a class="stat_link_pulse" href="/pulse?trail=1&step=month">Pulse</a></h1>
       			<!--
       			<a href="/pulse?step=day&trail=1">Days</a>
       			<a href="/pulse?step=week&trail=1">Weeks</a>
@@ -83,10 +83,10 @@
       			<a href="/pulse?step=year&trail=1">Years</a>
       			-->
 
-      			<span onclick="showRangeManual('pulse','days')" class="stat_selector_pulse selector_pulse_days">7 days</span>
-      			| <span onclick="showRangeManual('pulse','weeks')" class="stat_selector_pulse selector_pulse_weeks">12 weeks</span>
-      			| <span onclick="showRangeManual('pulse','months')" class="stat_selector_pulse selector_pulse_months" style="opacity:0.5;">12 months</span>
-      			| <span onclick="showRangeManual('pulse','years')" class="stat_selector_pulse selector_pulse_years">10 years</span>
+      			<span onclick="showRangeManual('pulse','day')" class="stat_selector_pulse selector_pulse_day">7 days</span>
+      			| <span onclick="showRangeManual('pulse','week')" class="stat_selector_pulse selector_pulse_week">12 weeks</span>
+      			| <span onclick="showRangeManual('pulse','month')" class="stat_selector_pulse selector_pulse_month" style="opacity:0.5;">12 months</span>
+      			| <span onclick="showRangeManual('pulse','year')" class="stat_selector_pulse selector_pulse_year">10 years</span>
       			<!--
       			### this is for extra views of the current canonical week / month / year
       			<br/>
@@ -96,10 +96,10 @@
       			-->
       			<br/><br/>
 
-      			<span class="stat_module_pulse pulse_months">KEY_PULSE_MONTHS</span>
-      			<span class="stat_module_pulse pulse_days" style="display:none;">KEY_PULSE_DAYS</span>
-      			<span class="stat_module_pulse pulse_years" style="display:none;">KEY_PULSE_YEARS</span>
-      			<span class="stat_module_pulse pulse_weeks" style="display:none;">KEY_PULSE_WEEKS</span>
+      			<span class="stat_module_pulse pulse_month">KEY_PULSE_MONTHS</span>
+      			<span class="stat_module_pulse pulse_day" style="display:none;">KEY_PULSE_DAYS</span>
+      			<span class="stat_module_pulse pulse_year" style="display:none;">KEY_PULSE_YEARS</span>
+      			<span class="stat_module_pulse pulse_week" style="display:none;">KEY_PULSE_WEEKS</span>
       			<!--
       			<span class="stat_module_pulse pulse_week" style="display:none;">KEY_PULSE_WEEK</span>
       			<span class="stat_module_pulse pulse_month" style="display:none;">KEY_PULSE_MONTH</span>
diff --git a/website/start.py b/website/start.py
index 59e8c51..72e6b7d 100644
--- a/website/start.py
+++ b/website/start.py
@@ -12,7 +12,7 @@ def instructions(keys):
 	# commands to execute on load for default ranges
 	js_command = "showRange('topartists','" + get_settings("DEFAULT_RANGE_CHARTS_ARTISTS") + "');"
 	js_command += "showRange('toptracks','" + get_settings("DEFAULT_RANGE_CHARTS_TRACKS") + "');"
-	js_command += "showRange('pulse','" + get_settings("DEFAULT_RANGE_PULSE") + "');"
+	js_command += "showRange('pulse','" + get_settings("DEFAULT_STEP_PULSE") + "');"
 
 
 	clock()
diff --git a/website/track.html b/website/track.html
index 16d2f94..4299771 100644
--- a/website/track.html
+++ b/website/track.html
@@ -30,32 +30,32 @@
 		<table class="twopart">
 			<tr>
 				<td>
-					<h2><a href='/pulse?KEY_SCROBBLELINK&step=year&trail=1'>Pulse</a></h2>
-					<span onclick="showRangeManual('pulse','days')" class="stat_selector_pulse selector_pulse_days">7 days</span>
-		      			| <span onclick="showRangeManual('pulse','weeks')" class="stat_selector_pulse selector_pulse_weeks">12 weeks</span>
-		      			| <span onclick="showRangeManual('pulse','months')" class="stat_selector_pulse selector_pulse_months" style="opacity:0.5;">12 months</span>
-		      			| <span onclick="showRangeManual('pulse','years')" class="stat_selector_pulse selector_pulse_years">10 years</span>
+					<h2><a class="stat_link_pulse" href='/pulse?KEY_SCROBBLELINK&trail=1&step=month'>Pulse</a></h2>
+					<span onclick="showRangeManual('pulse','day')" class="stat_selector_pulse selector_pulse_day">7 days</span>
+		      			| <span onclick="showRangeManual('pulse','week')" class="stat_selector_pulse selector_pulse_week">12 weeks</span>
+		      			| <span onclick="showRangeManual('pulse','month')" class="stat_selector_pulse selector_pulse_month" style="opacity:0.5;">12 months</span>
+		      			| <span onclick="showRangeManual('pulse','year')" class="stat_selector_pulse selector_pulse_year">10 years</span>
 
 		      			<br/><br/>
 
-		      			<span class="stat_module_pulse pulse_months">KEY_PULSE_MONTHS</span>
-		      			<span class="stat_module_pulse pulse_days" style="display:none;">KEY_PULSE_DAYS</span>
-		      			<span class="stat_module_pulse pulse_years" style="display:none;">KEY_PULSE_YEARS</span>
-		      			<span class="stat_module_pulse pulse_weeks" style="display:none;">KEY_PULSE_WEEKS</span>
+		      			<span class="stat_module_pulse pulse_month">KEY_PULSE_MONTHS</span>
+		      			<span class="stat_module_pulse pulse_day" style="display:none;">KEY_PULSE_DAYS</span>
+		      			<span class="stat_module_pulse pulse_year" style="display:none;">KEY_PULSE_YEARS</span>
+		      			<span class="stat_module_pulse pulse_week" style="display:none;">KEY_PULSE_WEEKS</span>
 				</td>
 				<td>
-					<h2><a href='/performance?KEY_SCROBBLELINK&step=year&trail=1'>Performance</a></h2>
-					<span onclick="showRangeManual('pulse','days')" class="stat_selector_pulse selector_pulse_days">7 days</span>
-		      			| <span onclick="showRangeManual('pulse','weeks')" class="stat_selector_pulse selector_pulse_weeks">12 weeks</span>
-		      			| <span onclick="showRangeManual('pulse','months')" class="stat_selector_pulse selector_pulse_months" style="opacity:0.5;">12 months</span>
-		      			| <span onclick="showRangeManual('pulse','years')" class="stat_selector_pulse selector_pulse_years">10 years</span>
+					<h2><a class="stat_link_pulse" href='/performance?KEY_SCROBBLELINK&trail=1&step=month'>Performance</a></h2>
+					<span onclick="showRangeManual('pulse','day')" class="stat_selector_pulse selector_pulse_day">7 days</span>
+		      			| <span onclick="showRangeManual('pulse','week')" class="stat_selector_pulse selector_pulse_week">12 weeks</span>
+		      			| <span onclick="showRangeManual('pulse','month')" class="stat_selector_pulse selector_pulse_month" style="opacity:0.5;">12 months</span>
+		      			| <span onclick="showRangeManual('pulse','year')" class="stat_selector_pulse selector_pulse_year">10 years</span>
 
 		      			<br/><br/>
 
-		      			<span class="stat_module_pulse pulse_months">KEY_PERFORMANCE_MONTHS</span>
-		      			<span class="stat_module_pulse pulse_days" style="display:none;">KEY_PERFORMANCE_DAYS</span>
-		      			<span class="stat_module_pulse pulse_years" style="display:none;">KEY_PERFORMANCE_YEARS</span>
-		      			<span class="stat_module_pulse pulse_weeks" style="display:none;">KEY_PERFORMANCE_WEEKS</span>
+		      			<span class="stat_module_pulse pulse_month">KEY_PERFORMANCE_MONTHS</span>
+		      			<span class="stat_module_pulse pulse_day" style="display:none;">KEY_PERFORMANCE_DAYS</span>
+		      			<span class="stat_module_pulse pulse_year" style="display:none;">KEY_PERFORMANCE_YEARS</span>
+		      			<span class="stat_module_pulse pulse_week" style="display:none;">KEY_PERFORMANCE_WEEKS</span>
 				</td>
 			</tr>
 		</table>