diff --git a/js/main.js b/js/main.js
index a144713..25a8933 100644
--- a/js/main.js
+++ b/js/main.js
@@ -70,16 +70,29 @@ function setPage(path){
 				const len = $("#article-container > article").length;
 				let cnt = 0;
 				$("#article-container > article").each((i, elmt) => {
-					$(elmt).html(marked($(elmt).html(), markedOpt, (err, res) => {
+
+					marked($(elmt).html(), markedOpt, (err, res) => {
+						$(elmt).html(res);
+
 						cnt++;
 						if(cnt === len){
 							if(path == "/skills"){
-								// wow such ugly hack... any it works (and when it fails only the graph title disappear, so no big deal)
-								setTimeout(skillsPageSetup, 500);
+								skillsPageSetup();
 							}
+							setTimeout(() => {
+								if(window.location.hash != ""){
+									target = $(window.location.hash);
+									if(target.length > 0){
+										target = target[0];
+										$('html,body').animate({
+											scrollTop: (target.offsetTop)
+										}, 400);
+									}
+
+								}
+							}, 500);// I'm lazy to search a way to wait for the view engine to be updated, 500ms should be fine
 						}
-						return res;
-					}));
+					});
 				});
 			})
 			.fail((err) => {
@@ -254,21 +267,21 @@ function skillsPageSetup(){
 	{
 		var ctx = document.getElementById("tools").getContext("2d");
 		var data = {
-		    labels : ["Git", "Gitlab / Github / Gitea", "GitlabCI / TravisCI / CircleCI"],
-		    datasets : [{
-		        fillColor : "rgba(83, 142, 193, 0.5)",
-		        strokeColor : "rgb(96, 145, 255)",
-		        pointColor : "rgb(26, 118, 226)",
-		        pointStrokeColor : "#fff",
-		        data : [100, 90, 80]
-		    },{
-		        strokeColor : "rgba(0,0,0,0)",
-		        pointColor : "rgba(0,0,0,0)",
-		        data : [0, 100]
-		    }]
+			labels : ["Git", "Gitlab / Github / Gitea", "GitlabCI / TravisCI / CircleCI"],
+			datasets : [{
+				fillColor : "rgba(83, 142, 193, 0.5)",
+				strokeColor : "rgb(96, 145, 255)",
+				pointColor : "rgb(26, 118, 226)",
+				pointStrokeColor : "#fff",
+				data : [100, 90, 80]
+			},{
+				strokeColor : "rgba(0,0,0,0)",
+				pointColor : "rgba(0,0,0,0)",
+				data : [0, 100]
+			}]
 		};
 
-	    graphoptions["graphTitle"] = "Tools";
-	    new Chart(ctx).Radar(data,graphoptions);
+		graphoptions["graphTitle"] = "Tools";
+		new Chart(ctx).Radar(data,graphoptions);
 	}
 }