diff --git a/digimarks.py b/digimarks.py
index 4051f8b..dd702d9 100644
--- a/digimarks.py
+++ b/digimarks.py
@@ -476,7 +476,16 @@ def bookmarks(userkey, filtermethod = None, sortmethod = None):
         bookmarks = Bookmark.select().where(Bookmark.userkey == userkey, Bookmark.status == Bookmark.VISIBLE).order_by(Bookmark.created_date.desc())
 
     theme = get_theme(userkey)
-    return render_template('bookmarks.html', bookmarks=bookmarks, userkey=userkey, tags=tags, filter_text=filter_text, message=message, theme=theme)
+    return render_template('bookmarks.html',
+                           bookmarks=bookmarks,
+                           userkey=userkey,
+                           tags=tags,
+                           filter_text=filter_text,
+                           message=message,
+                           theme=theme,
+                           editable=True,  # bookmarks can be edited
+                           showtags=True,  # tags should be shown with the bookmarks
+                          )
 
 
 
diff --git a/templates/cards.html b/templates/cards.html
index 21cc6ae..1a8bb34 100644
--- a/templates/cards.html
+++ b/templates/cards.html
@@ -34,10 +34,13 @@
             </div>
             <div class="card-reveal {{ theme.CARD_BACKGROUND }}">
                 <span class="card-title {{ theme.CARD_TEXT }}">Added @ {{ bookmark.created_date.strftime('%Y-%m-%d %H:%M') }}<i class="material-icons right">close</i></span>
+                {% if editable %}
                 <div class="{{ theme.CARD_TEXT }}" style="padding-top: 10px;">
                 <a href="{{ url_for('editbookmark', userkey=userkey, urlhash=bookmark.url_hash) }}" style="padding: 3px"><i class="tiny material-icons">mode_edit</i> EDIT</a>
                 <a href="{{ url_for('deletingbookmark', userkey=userkey, urlhash=bookmark.url_hash) }}" style="padding: 3px" class="red-text"><i class="tiny material-icons">delete</i> DELETE</a>
                 </div>
+                {% endif %}
+                {% if showtags %}
                 <div class="digimark-card-header-tags">
                 {% for tag in bookmark.tags_list %}
                     <div class="chip">
@@ -45,6 +48,7 @@
                     </div>
                 {% endfor %}
                 </div>
+                {% endif %}
             </div>
         </div>
     </div>