diff --git a/python/web/library/views.py b/python/web/library/views.py
index b1c1ae5..0887476 100644
--- a/python/web/library/views.py
+++ b/python/web/library/views.py
@@ -59,8 +59,16 @@ def PersonIndex(request):
 
 def MapIndex(request):
     shelves = Placement.get_all_shelves()
-    shelf_lists = [(shelf, Placement.shelf_as_list_row_then_col(shelf)) for shelf in shelves]
-    return render_to_response('map/index.html', {'shelf_lists': shelf_lists})
+    highlight_list = []
+    if 'highlight' in request.GET:
+        highlight_string = request.GET['highlight']
+        for category in Category.objects.filter(id=highlight_string):
+            highlight_list.append(category)
+    shelf_lists = [{'shelf_name': shelf,
+                    'shelf_list': Placement.shelf_as_list_row_then_col(shelf)}
+                   for shelf in shelves]
+    print highlight_list
+    return render_to_response('map/index.html', {'shelf_lists': shelf_lists, 'highlight': highlight_list})
 
 def MapView(request,shelf_identifier):
     if shelf_identifier not in Placement.get_all_shelves():
diff --git a/python/web/templates/map/index.html b/python/web/templates/map/index.html
index 4704288..bdc2fcd 100644
--- a/python/web/templates/map/index.html
+++ b/python/web/templates/map/index.html
@@ -9,14 +9,14 @@ Hyllekart
 {% for shelf in shelf_lists %}
 <span class="img">
 <table border="1" class="shelf" >
-  <caption class="caption">Hylle {% if forloop.last %}B{% else %}A{% endif %}</caption>
-  {% for row in shelf.1 %}
+  <caption class="caption">Hylle {{ shelf.shelf_name }}</caption>
+  {% for row in shelf.shelf_list %}
   <tr>
     {% for column in row %}
     <td>
       <table>
         {% for category in column %}
-        <tr><td><a href="/kategori/{{ category.id }}">{{ category }}</a></td></tr>
+        <tr><td {% if category in highlight_list %}class="highlight"{% endif %}>{% if category in highlight_list %}!!{% endif %}<a href="/kategori/{{ category.id }}">{{ category }}</a></td></tr>
         {% endfor %}
       </table>
     </td>