diff --git a/content/img/index.html b/content/img/index.html
new file mode 100644
index 0000000..90f36ab
--- /dev/null
+++ b/content/img/index.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta http-equiv="refresh" content="0;%CONTENT_DIR%/" />
+    </head>
+    <body>
+        <p> Nope. </p>
+    </body>
+</html>
diff --git a/content/login/index.html b/content/login/index.html
index 3cc4db4..75b838a 100644
--- a/content/login/index.html
+++ b/content/login/index.html
@@ -7,10 +7,10 @@
   </head>
   <body>
     <ul class="topnav">
-  		<li><a href="index.html">Home</a></li>
+  		<li><a href="%CONTENT_DIR%/">Home</a></li>
   		<li><a href="#news">News</a></li>
   		<li><a href="%CONTENT_DIR%/about/">About</a></li>
-  		<li class="right"><a class="active" href="login.html">Log In</a></li>
+  		<li class="right"><a class="active" href="%CONTENT_DIR%/login/">Log In</a></li>
 	</ul>
 
 	<div style="padding:0 16px;">
@@ -29,7 +29,10 @@
 		<input type="text" name="name" maxlength="20" placeholder="Username" />
 		<input type="password" name="password" maxlength="256" placeholder="Password" />
         <p></p>
-		<a href="/common/"> <button> Log in </button> </a>
+        <input type="submit" value="Log in" />
+        <!--
+          @Ilja: HTML button tags are only useful in conjuction to JavaScript or in little hacks like my <a> + <button>. In HTML forms, there is a special type of button for submitting forms (see above).
+        -->
 		</form>
 		<p></p>
 	  </div>
diff --git a/content/news/index.php b/content/news/index.php
new file mode 100644
index 0000000..e69de29
diff --git a/content/signup/index.html b/content/signup/index.html
index 6be5b6e..ab29cb9 100644
--- a/content/signup/index.html
+++ b/content/signup/index.html
@@ -6,10 +6,10 @@
       </head>
       <body>
         <ul class="topnav">
-  			<li><a href="index.html">Home</a></li>
-  		    <li><a href="#news">News</a></li>
-  		    <li><a href="%CONTENT_DIR%/about">About</a></li>
-  		    <li class="right"><a href="login.html">Log In</a></li>
+  			<li><a href="%CONTENT_DIR%/">Home</a></li>
+  		    <li><a href="%CONTENT_DIR%/news/">News</a></li>
+  		    <li><a href="%CONTENT_DIR%/about/">About</a></li>
+  		    <li class="right"><a href="%CONTENT_DIR%/login/">Log In</a></li>
 		</ul>
 
 		<div style="padding:0 16px;">
diff --git a/content/userhome/index.php b/content/userhome/index.php
index 1f125c8..8683644 100644
--- a/content/userhome/index.php
+++ b/content/userhome/index.php
@@ -2,8 +2,7 @@
   <head>
     <title>ThreadR</title>
   </head>
- 
+
   <body>
     <h1> ThreadR </h1>
-    <h2> Welcome back, <?php echo $_GET['username']; ?>!</h2>
-    
+    <h2> Welcome back, <?php echo $_SESSION['username']; ?>!</h2>
