diff --git a/static/main.css b/static/main.css
index b415ae5..e81de2a 100644
--- a/static/main.css
+++ b/static/main.css
@@ -36,6 +36,7 @@
 
 .status-emoji {
 	height: 20px;
+	margin-bottom: -4px;
 	witdth: auto;
 }
 
@@ -46,6 +47,7 @@
 
 .status-action {
 	display: flex;
+	margin-top: 4px;
 }
 
 .status-action a {
@@ -75,3 +77,33 @@
 .icon.dripicons-retweet.retweeted {
 	color: green;
 }
+
+.status-image,
+.status-video {
+	max-height: 180px;
+	width: auto;
+}
+
+.page-title {
+	font-size: 23pt;
+}
+
+.navigation {
+	margin: 4px 0;
+}
+
+.navigation a {
+	margin-right: 8px;
+}
+
+.timeline-post-form {
+	margin: 8px 0;
+}
+
+.signin-form {
+	margin: 8px 0;
+}
+
+.signin-form input {
+	margin: 4px 0;
+}
diff --git a/templates/homepage.tmpl b/templates/homepage.tmpl
index 256bb29..63e613a 100644
--- a/templates/homepage.tmpl
+++ b/templates/homepage.tmpl
@@ -1,4 +1,4 @@
 {{template "header.tmpl"}}
-<h1> HOME </h1>
+<div class="page-title"> Home </div>
 <a href="/signin"> Signin </a>
 {{template "footer.tmpl"}}
diff --git a/templates/navigation.tmpl b/templates/navigation.tmpl
new file mode 100644
index 0000000..ea4a213
--- /dev/null
+++ b/templates/navigation.tmpl
@@ -0,0 +1,4 @@
+<div class="navigation">
+	<a href="/timeline">home</a>
+	<a href="/signout">sign out</a>
+</div>
diff --git a/templates/signin.tmpl b/templates/signin.tmpl
index 07bc132..fc2edca 100644
--- a/templates/signin.tmpl
+++ b/templates/signin.tmpl
@@ -1,9 +1,10 @@
 {{template "header.tmpl"}}
-<h3> Signin </h3>
-<a href="/"> Home </a>
-<form action="/signin" method="post">
+<div class="page-title"> Signin </div>
+
+<form class="signin-form" action="/signin" method="post">
 	<input type="text" name="instance" placeholder="instance">
 	<br>
 	<button type="submit"> Submit </button>
 </form>
+
 {{template "footer.tmpl"}}
diff --git a/templates/thread.tmpl b/templates/thread.tmpl
index 4d6aad0..ad312df 100644
--- a/templates/thread.tmpl
+++ b/templates/thread.tmpl
@@ -1,5 +1,6 @@
 {{template "header.tmpl"}}
-<h1> THREAD </h1>
+<div class="page-title"> Thread </div>
+{{template "navigation.tmpl"}}
 
 {{range .Context.Ancestors}}
 {{template "status.tmpl" .}}
diff --git a/templates/timeline.tmpl b/templates/timeline.tmpl
index b9ee3a5..7f3234c 100644
--- a/templates/timeline.tmpl
+++ b/templates/timeline.tmpl
@@ -1,5 +1,6 @@
 {{template "header.tmpl"}}
-<h1> TIMELINE </h1>
+<div class="page-title"> Timeline </div>
+{{template "navigation.tmpl"}}
 
 <form class="timeline-post-form" action="/post" method="POST">
 	<label for="post-content"> New Post </label>