diff --git a/assets/sass/pages/blog.scss b/assets/sass/pages/blog.scss
index 889ff76..249cbe9 100644
--- a/assets/sass/pages/blog.scss
+++ b/assets/sass/pages/blog.scss
@@ -228,6 +228,13 @@
       padding: 15px;
     }
 
+    .blog-tags-filter {
+      border: 0;
+      background: transparent;
+      padding: 0;
+      margin-bottom: 0px;
+    }
+
     &:hover {
       background: rgba(0, 255, 0, 0.1);
       border-color: rgba(0, 255, 0, 0.6);
@@ -264,12 +271,14 @@
         }
       }
 
-      .blog-tags .tag {
+      
+      .tag-filter-link {
         background: rgba(255, 153, 0, 0.2);
         border-color: rgba(255, 153, 0, 0.5);
         color: #ff9900;
         text-shadow: 0 0 5px rgba(255, 153, 0, 0.5);
       }
+    
     }
 
     // Post title
diff --git a/lastfm-week.sh b/lastfm-week.sh
index a4fb1f5..c208320 100755
--- a/lastfm-week.sh
+++ b/lastfm-week.sh
@@ -19,7 +19,7 @@ fi
 
 API_BASE="http://ws.audioscrobbler.com/2.0/"
 
-# Get current Unix timestamp
+# Get current timestamp
 NOW=$(date +%s)
 # Get timestamp from 7 days ago
 WEEK_AGO=$((NOW - 604800))
diff --git a/layouts/blog/summary.html b/layouts/blog/summary.html
index 4bd3a2e..50c1709 100644
--- a/layouts/blog/summary.html
+++ b/layouts/blog/summary.html
@@ -1,21 +1,22 @@
 <div class="blog-post-card{{ if not (in .Params.tags "weeknote") }} non-weekly{{ end }}">
 	<h1 class="blog-title">
-		{{ if in .Params.tags "weeknote" }}
+
+		<a href="{{ .Permalink }}">
 			{{ .Title }}
-		{{ else }}
-			<a href="{{ .Permalink }}">
-				{{ .Title }}
-			</a>
-		{{ end }}
+		</a>
+	
 		{{ if .Date }}
 		<span class="blog-date">{{ .Date.Format "02-01-2006" }}</span>
 		{{ end }}
 	</h1>
 	{{ if .Params.tags }}
-	<div class="blog-tags">
+	<div class="blog-tags-filter">
+		<div class="tag-links">
 		{{ range .Params.tags }}
-		<span class="tag">{{ . }}</span>
+			{{ $tagURL := printf "/tags/%s/" (. | urlize) }}
+            <a href="{{ $tagURL }}" class="tag-filter-link">{{ . }}</a>
 		{{ end }}
+		</div> 
 	</div>
 	{{ end }}
 	{{ if in .Params.tags "weeknote" }}