diff --git a/python/web/media/styles/scaffold.css b/python/web/media/styles/scaffold.css
index 9614667..c05fad0 100644
--- a/python/web/media/styles/scaffold.css
+++ b/python/web/media/styles/scaffold.css
@@ -38,11 +38,13 @@ h2 {
   color: #3399CC; 
   font-family: verdana, sans-serif, arial, courier new; 
   text-align: left; 
+  text-shadow: 1px 1px 1px #44A4BD;
 }
 h3 {
   color: #44A4BD; 
   font-family: verdana, sans-serif, arial, courier new; 
-  text-align: left
+  text-align: left;
+  text-shadow: 1px 1px 1px #3399CC;
 }
 h4 {
   color: #3399CC; 
@@ -79,6 +81,10 @@ img.aligncenter {
   text-align: center;
 }
 
+.input {
+  width: 320px;
+}
+
 .img {
   float: left;
   display: inline;
diff --git a/python/web/templates/base/main.html b/python/web/templates/base/main.html
index d1fe0d9..b88d0e9 100644
--- a/python/web/templates/base/main.html
+++ b/python/web/templates/base/main.html
@@ -1,24 +1,25 @@
 <!DOCTYPE html>
 <html>
-<head>
-<title>Worblehat 0.1: {% block title %}{% endblock %}</title>
-<meta charset="utf-8">
-<link type="text/css" rel="stylesheet" href="/media/styles/scaffold.css">
+  <head>
+    <title>Worblehat 0.1: {% block title %}{% endblock %}</title>
+    <meta charset="utf-8">
+    <link type="text/css" rel="stylesheet" href="/media/styles/scaffold.css">
 
-{% block meta %}
-{% endblock %}
-</head>
-<body>
-  <h1>Worblehat</h1>
-  <hr/>
-{% block content %}
-{% endblock %}
-<br/><br/>
-<hr/>
-  <div class="field">
-<form action="/let/" method="get">
-  <input type="search" name="searchterm" placeholder="Søk etter bøker eller forfattere" autofocus> 
-  <input type="submit" value="Søk!">
-</form>
-</div>
-</body>
+    {% block meta %}
+    {% endblock %}
+  </head>
+  <body>
+    <h1>Worblehat</h1>
+    <hr/>
+    {% block content %}
+    {% endblock %}
+    <br/><br/>
+    <hr/>
+    <div class="field">
+      <form action="/let/" method="get">
+        <input type="search" name="searchterm" class="input" placeholder="Søk etter bøker, forfattere eller kategorier" autofocus> 
+        <input type="submit" value="Søk!">
+      </form>
+    </div>
+  </body>
+</html>
diff --git a/python/web/templates/category/view.html b/python/web/templates/category/view.html
index 0991f56..636508b 100644
--- a/python/web/templates/category/view.html
+++ b/python/web/templates/category/view.html
@@ -1,20 +1,21 @@
 {% extends "base/main.html" %}
 
 {%block title%}
-Worblehat 0.1: Kategori: {{ category }}
+{{ category }}
 {% endblock %}
 
 {% block content %}
 
-{{ category }}<br />
+<h2>{{ category }}</h2>
 
 {% if not book_list %}
 Det finnes ingen bøker i denne kategorien.
 {% else %}
-Følgende bøker finnes i denne kategorien:
+<!---Følgende bøker finnes i denne kategorien:---!>
+<div class="key">Bøker:</div>
 <ul>
   {% for book in book_list %}
-    <li><a href="/bok/{{ book.id }}">{{ book }}</a></li>
+    <li><a href="/bok/{{ book.isbn }}">{{ book }}</a></li>
   {% endfor %}
 </ul>
 {% endif %}
diff --git a/python/web/templates/map/index.html b/python/web/templates/map/index.html
index b8a3545..749c6c0 100644
--- a/python/web/templates/map/index.html
+++ b/python/web/templates/map/index.html
@@ -1,11 +1,11 @@
 {% extends "base/main.html" %}
 
 {%block title%}
-Worblehat 0.1: Fresh, detailed, life-saving maps!
+Ferske, detaljerte og livsreddende kart!<!---Fresh, detailed, life-saving maps!---!>
 {% endblock %}
 
 {% block content %}
-Hyller:
+<h2>Hyller</h2>
 <ul>
   {% for shelf_name in shelves %}
     <li><a href="/kart/{{ shelf_name }}">{{ shelf_name }}</a></li>
diff --git a/python/web/templates/map/view.html b/python/web/templates/map/view.html
index 7ec2497..acf7637 100644
--- a/python/web/templates/map/view.html
+++ b/python/web/templates/map/view.html
@@ -1,10 +1,11 @@
 {% extends "base/main.html" %}
 
-{%block title%}
-Worblehat 0.1: Hylle {{ shelf_name }}
+{% block title %}
+Hylle {{ shelf_name }}
 {% endblock %}
 
 {% block content %}
+<h2>Hylle {{ shelf_name }}</h2>
 <table border="1">
 {% for row in shelf %}
   <tr>
diff --git a/python/web/templates/search/search.html b/python/web/templates/search/search.html
index 0bf4492..6ca9458 100644
--- a/python/web/templates/search/search.html
+++ b/python/web/templates/search/search.html
@@ -13,12 +13,20 @@ Du søkte på <b>{{ search_string }}</b>.<br/><br/>
 		{% for person in people %}
 			<a href="/person/{{ person.id }}/">{{ person.first_name }} {{ person.last_name }}</a><br>
 		{% endfor %}
-	{% endif %}
         <br/>
+	{% endif %}
 	{% if books %}
         <span class="key">Bøker:</span><br/>
 		{% for book in books %}
 			<a href="/bok/{{ book.isbn }}/">{{ book.title }}</a><br>
 		{% endfor %}
+        <br/>
+	{% endif %}
+	{% if categories %}
+        <span class="key">Kategorier:</span><br/>
+		{% for category in categories %}
+			<a href="/kategori/{{ category.id }}/">{{ category.name }}</a><br>
+		{% endfor %}
+        <br/>
 	{% endif %}
 {% endblock %}
