diff --git a/digimarks.py b/digimarks.py
index 639b517..e83f76e 100644
--- a/digimarks.py
+++ b/digimarks.py
@@ -127,7 +127,7 @@ def bookmarks(userkey):
     #    return render_template('bookmarks.html', bookmarks)
     #else:
     #    abort(404)
-    bookmarks = Bookmark.select(Bookmark.userkey == userkey)
+    bookmarks = Bookmark.select().where(Bookmark.userkey == userkey)
     return render_template('bookmarks.html', bookmarks=bookmarks, userkey=userkey)
 
 
diff --git a/static/css/digimarks.css b/static/css/digimarks.css
index 7e1e86e..34c79b3 100644
--- a/static/css/digimarks.css
+++ b/static/css/digimarks.css
@@ -26,3 +26,10 @@
    .input-field .prefix.active {
      color: #000;
    }
+
+
+   /* Card title anchor colour */
+   .white-text .card-title a
+   {
+       color: #FFF;
+   }
diff --git a/templates/bookmarks.html b/templates/bookmarks.html
index c74387a..0d76594 100644
--- a/templates/bookmarks.html
+++ b/templates/bookmarks.html
@@ -3,7 +3,7 @@
 {% block pageheader %}Bookmarks{% endblock %}
 {% block pagecontent %}
 <div class="row">
-    {% for bookmark in object_list %}
+    {% for bookmark in bookmarks %}
     <div class="col s4">
         {#
         <div class="thumbnail">
@@ -14,10 +14,20 @@
             <p>{{ bookmark.created_date.strftime("%m/%d/%Y %H:%M") }}</p>
         </div>
         #}
-
-        <a href="{{ bookmark.url }}" title="{{ bookmark.url }}">
-            {{ bookmark.title }}
-        </a>
+        <div class="card blue-grey darken-1">
+            <div class="card-content white-text">
+                <span class="card-title activator">
+                    <a href="{{ bookmark.url }}" title="{{ bookmark.url }}">
+                        {{ bookmark.title }}
+                    </a>
+                    <i class="material-icons right">more_vert</i>
+                </span>
+            </div>
+            <div class="card-reveal teal darken-4">
+                <span class="card-title">{{ bookmark.title }}<i class="material-icons right">close</i></span>
+                <div><a href="{{ url_for('editbookmark', userkey=userkey, urlhash=bookmark.url_hash) }}">edit</a></div>
+            </div>
+        </div>
     </div>
     {% endfor %}