diff --git a/views/default.html b/views/default.html
index a0614edbc2851fe7b3503564b8bc1f1acce88c4d..35bb3030d8dc19e1f940cf099c280b9d8671a180 100644
--- a/views/default.html
+++ b/views/default.html
@@ -6,35 +6,41 @@
 
 
 
+% item_count = 0
+% tag_closed = True
 
-
-<div class="row">
-    % for p in pictures:
-        <div class="large-4 columns">
-            <div class="panel">
-                <p>
-                    <img src="{{p['filename']}}" style="max-width: 320px; max-height: 240px;" alt="{{p['description']}}"/>
+% for p in pictures:
+    % if item_count % 3 == 0:
+        <div class="row">
+        %tag_closed = False
+    % end
+    <div class="large-4 columns">
+        <div class="panel">
+            <div id="modal-{{p['id']}}" class="reveal-modal" data-reveal>
+                <h2>{{p['description']}}</h2>
+                <p style="text-align: center;">
+                    <img src="{{p['filename']}}" alt="{{p['description']}}"/>
                 </p>
+                <a class="close-reveal-modal">&#215;</a>
             </div>
-        </div>
-    % end
-</div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
+            <p>
+                <a href="#" data-reveal-id="modal-{{p['id']}}">
+                    <img src="{{p['filename']}}" alt="{{p['description']}}"/>
+                </a>
+            </p>
+        </div>
+    </div>
 
+    % if item_count % 3 == 2:
+        </div>
+        %tag_closed = True
+    % end
+    % item_count += 1
+% end
+%if not tag_closed:
+    </div>
+%end
 
 
 
@@ -44,12 +50,12 @@
   <input type="hidden" name="domain" value="{{current_domain}}"/>
   description:      <input type="text" name="description" />
   Select a file: <input type="file" name="upload" />
-  <input type="submit" value="Start upload" />
+  <input type="submit" value="Start upload" class="button" />
 </form>
 
 <h1>Create domain alias</h1>
 <form action="/newAlias" method="post">
   <input type="hidden" name="domain" value="{{current_domain}}"/>
   description:      <input type="text" name="description" />
-  <input type="submit" value="Create alias" />
+  <input type="submit" value="Create alias" class="button" />
 </form>
\ No newline at end of file