diff --git a/pages/css/style.css b/pages/css/style.css
index 0b9ca84..78ab907 100644
--- a/pages/css/style.css
+++ b/pages/css/style.css
@@ -2,6 +2,6 @@ body {
 	background-color: #8888;
 }
 
-.loginbox, .userbox, .errormsg, .successmsg {
+#loginbox, #userbox, #errormsg, #successmsg {
 	display: none;
 }
diff --git a/src/io/github/norbipeti/chat/server/IOHelper.java b/src/io/github/norbipeti/chat/server/IOHelper.java
index 2846423..cc97b35 100644
--- a/src/io/github/norbipeti/chat/server/IOHelper.java
+++ b/src/io/github/norbipeti/chat/server/IOHelper.java
@@ -110,7 +110,7 @@ public class IOHelper {
 	public static HashMap<String, String> GetCookies(HttpExchange exchange) {
 		if (!exchange.getRequestHeaders().containsKey("Cookie"))
 			return new HashMap<>();
-		HashMap<String, String> map = new HashMap<>(); // TODO
+		HashMap<String, String> map = new HashMap<>();
 		for (String cheader : exchange.getRequestHeaders().get("Cookie")) {
 			String[] spl = cheader.split("\\;\\S");
 			for (String s : spl) {
diff --git a/src/io/github/norbipeti/chat/server/page/IndexPage.java b/src/io/github/norbipeti/chat/server/page/IndexPage.java
index f908d33..f9fc9bd 100644
--- a/src/io/github/norbipeti/chat/server/page/IndexPage.java
+++ b/src/io/github/norbipeti/chat/server/page/IndexPage.java
@@ -9,7 +9,7 @@ import io.github.norbipeti.chat.server.db.domain.User;
 public class IndexPage extends Page {
 
 	@Override
-	public void handlePage(HttpExchange exchange) throws IOException { //TODO: Make a base HTML and insert all pages into that
+	public void handlePage(HttpExchange exchange) throws IOException {
 		User user = IOHelper.GetLoggedInUser(exchange);
 		if (user == null)
 			IOHelper.SendModifiedPage(200, this,
diff --git a/src/io/github/norbipeti/chat/server/page/RegisterPage.java b/src/io/github/norbipeti/chat/server/page/RegisterPage.java
index c4b1e85..9c63425 100644
--- a/src/io/github/norbipeti/chat/server/page/RegisterPage.java
+++ b/src/io/github/norbipeti/chat/server/page/RegisterPage.java
@@ -47,7 +47,7 @@ public class RegisterPage extends Page {
 				IOHelper.LoginUser(exchange, user);
 				IOHelper.Redirect("/", exchange);
 			}
-			return; // TODO: Only show tag when needed
+			return;
 		}
 		IOHelper.SendPage(200, this, exchange);
 	}
diff --git a/src/io/github/norbipeti/chat/server/page/StylePage.java b/src/io/github/norbipeti/chat/server/page/StylePage.java
index 5d8a944..23bcdab 100644
--- a/src/io/github/norbipeti/chat/server/page/StylePage.java
+++ b/src/io/github/norbipeti/chat/server/page/StylePage.java
@@ -25,8 +25,10 @@ public class StylePage extends Page {
 			File cssfile = new File("pages", exchange.getRequestURI().getPath());
 			if (!cssfile.exists())
 				IOHelper.SendResponse(404, "<h1>CSS file not found</h1>", exchange);
-			else
+			else {
+				exchange.getResponseHeaders().add("Content-Type", "text/css");
 				IOHelper.SendResponse(200, IOHelper.ReadFile(cssfile), exchange);
+			}
 		} else
 			System.out.println(exchange.getRequestURI().getPath());
 	}