diff --git a/views/headers/site_wide.ejs b/views/headers/site_wide.ejs
index c363065..4d4cc27 100644
--- a/views/headers/site_wide.ejs
+++ b/views/headers/site_wide.ejs
@@ -1,6 +1,26 @@
-<a href="/"><%= locale.home_page %></a> 
-<a href="/index/pages"><%= locale.site_index %></a> 
-<a href="<%= config.new_post_url %>"><%= locale.new_post %></a>
-<form method="GET" action="/search" style="display: inline"><input type="text" placeholder="🔍" name="q"><input type="submit" value="Search"></form>
+<a id='home-page-link' href="/"><%= locale.home_page %></a>
+/
+<% if (config.rss == true) { %>
+    <a id='global-rss-link' href="/rss"><%= locale.rss_feed %></a>
+<% } %>
+/
+<% if (config.atom == true) { %>
+    <a id='global-atom-link' href="/atom"><%= locale.atom_feed %></a>
+<% } %>
+/
+<a id='new-post-link' href="<%= config.new_post_url %>"><%= locale.new_post %></a>
+<% if (config.allow_signup == true) { %>
+    <a id='signup-link' href="<%= config.signup_url %>"><%= locale.sign_up %></a>
+<% } %>
+/
+<form id='search-form' method="GET" action="/search" style="display: inline">
+	<input type="text" placeholder="🔍" name="q"><input type="submit" value="Search">
+</form>
 <br/>
+<div id='site-name'>
+	<h1><%- config.site_name %></h2>
+</div>
+<div id='site-description'>
+	<h2><%- config.site_description %></h2>
+</div>
 <%- config.seperator %>
diff --git a/views/headers/tag.ejs b/views/headers/tag.ejs
index 6d96152..89633cb 100644
--- a/views/headers/tag.ejs
+++ b/views/headers/tag.ejs
@@ -1,4 +1,6 @@
-<h1>
-    <%= locale.posts_tagged %>: "<%- tag %>"
-</h1>
+<div id='tag-page-title'>
+	<h1>
+	    <%= locale.posts_tagged %>: "<%- tag %>"
+	</h1>
+</div>
 <%- config.seperator %>
diff --git a/views/headers/timeline.ejs b/views/headers/timeline.ejs
index a18ae8c..e69de29 100644
--- a/views/headers/timeline.ejs
+++ b/views/headers/timeline.ejs
@@ -1,20 +0,0 @@
-<h1>
-    <%- config.site_name %>
-</h1>
-<h2>
-    <%- config.site_description %>
-</h2>
-<% if (config.rss == true) { %>
-    <a href="/rss"><%= locale.rss_feed %></a><br/>
-<% } %>
-<% if (config.atom == true) { %>
-    <a href="/atom"><%= locale.atom_feed %></a><br/>
-<% } %>
-<a href="<%= config.new_post_url %>"><%= locale.new_post %></a><br/>
-<% if (config.allow_signup == true) { %>
-    <a href="<%= config.signup_url %>"><%= locale.sign_up %></a><br/>
-<% } %>
-<% if (config.enable_hitcount == true) { %>
-<%= locale.hitcount %>: <%= hitcount %>
-<% } %>
-<%- config.seperator %>
diff --git a/views/headers/user.ejs b/views/headers/user.ejs
index e27f9b0..ecd2725 100644
--- a/views/headers/user.ejs
+++ b/views/headers/user.ejs
@@ -1,8 +1,10 @@
-<h1>
-    <%= user.prettyname %>
-</h1>
+<div id='user-page-title'>
+	<h1>
+	    <%= user.prettyname %>
+	</h1>
+</div>
 <p><%- func.render_md(user.description) %></p>
-<a href="<%= config.edit_account_base_url %>/<%= userID %>"><%= locale.edit_account %></a><br/>
-<a href="/user/<%= user.username %>/rss"><%= locale.rss_feed %></a><br/>
-<a href="/user/<%= user.username %>/atom"><%= locale.atom_feed %></a>
+<a id='edit-account-link' href="<%= config.edit_account_base_url %>/<%= userID %>"><%= locale.edit_account %></a><br/>
+<a id='rss-link' href="/user/<%= user.username %>/rss"><%= locale.rss_feed %></a><br/>
+<a id='atom-link' href="/user/<%= user.username %>/atom"><%= locale.atom_feed %></a>
 <%- config.seperator %>
diff --git a/views/partials/comment.ejs b/views/partials/comment.ejs
index d8491df..5855f03 100644
--- a/views/partials/comment.ejs
+++ b/views/partials/comment.ejs
@@ -1,5 +1,14 @@
-<b><%= comment.name %></b>
-<%= func.unix_time_to_date_format(comment.pubdate) %>
-<a href='/comment/<%= postID %>-<%= comment.id %>'>No. <%= postID %>-<%= comment.id %></a>:<br/>
-<%- func.render_comment(comment.content) %>
+
+<div id='comment-name'>
+	<b><%= comment.name %></b>
+</div>
+<div id='comment-date date'>
+	<%= func.unix_time_to_date_format(comment.pubdate) %>
+</div>
+<div id='comment-id'>
+	<a href='/comment/<%= postID %>-<%= comment.id %>'>No. <%= postID %>-<%= comment.id %></a>:<br/>
+</div>
+<div id='comment-content'>
+	<%- func.render_comment(comment.content) %>
+</div>
 <br/>
diff --git a/views/partials/footer.ejs b/views/partials/footer.ejs
index c450990..a0bc463 100644
--- a/views/partials/footer.ejs
+++ b/views/partials/footer.ejs
@@ -1,3 +1,4 @@
+<a id='site-index-link' href="/index/pages"><%= locale.site_index %></a><br/>
 <%= locale.site_ran_by %> <%= config.site_admin %><br/>
 <%- locale.attribution %><br/>
 <%= locale.AI_consent %> <!-- remove consent for AI scrapers -->
diff --git a/views/posts/timeline.ejs b/views/posts/timeline.ejs
index 3408311..6e63d20 100644
--- a/views/posts/timeline.ejs
+++ b/views/posts/timeline.ejs
@@ -1,6 +1,6 @@
 <div id="post-header">
     <h1>
-        <%= post.title %>
+        <a href='/post/<%= post['id'] %>'><%= post.title %></a>
     </h1>
 </div>
 <div id="post-content">