diff --git a/templates/bookmarks.html b/templates/bookmarks.html
index 0d0b038..4f161ce 100644
--- a/templates/bookmarks.html
+++ b/templates/bookmarks.html
@@ -78,7 +78,7 @@
                     {% endfor %}
                     <i class="material-icons right">more_vert</i>
                 </span>
-                    <div class="valign-wrapper digimark-card-content">
+                <div class="valign-wrapper digimark-card-content">
                     <div class="valign">
                         {% if bookmark.http_status != 200 %}
                             <i class="tiny material-icons" title="HTTP status {{ bookmark.http_status }}">report_problem</i>
@@ -96,7 +96,7 @@
                             [ no title ]
                         {% endif %}
                     </a></div>
-                    </div>
+                </div>
             </div>
             <div class="card-reveal green darken-3">
                 <span class="card-title white-text valign-wrapper">Added @ {{ bookmark.created_date.strftime('%Y-%m-%d %H:%M') }}<i class="material-icons right">close</i></span>
diff --git a/templates/publicbookmarks.html b/templates/publicbookmarks.html
index 3b32513..7ce942e 100644
--- a/templates/publicbookmarks.html
+++ b/templates/publicbookmarks.html
@@ -27,25 +27,29 @@
 <div class="row">
     {% for bookmark in bookmarks %}
     <div class="col s12 m6 l4">
-        <div class="card green darken-3">
+        <div class="card tiny green darken-3">
             <div class="card-content white-text">
-                <span class="card-title activator"><i class="material-icons right">more_vert</i></span>
+                <span class="digimark-card-header activator"><i class="material-icons right">more_vert</i></span>
+                <div class="valign-wrapper digimark-card-content">
+                    <div class="valign">
                     {% if bookmark.http_status != 200 %}
                         <i class="material-icons" title="HTTP status {{ bookmark.http_status }}">report_problem</i>
                     {% endif %}
                     {% if bookmark.favicon %}
                         <img src="{{ url_for('static', filename='favicons/' + bookmark.favicon) }}" />&nbsp;&nbsp;&nbsp;
                     {% endif %}
-                    <p><a href="{{ bookmark.url }}" title="{{ bookmark.url }}" rel="noreferrer">
+                    <a href="{{ bookmark.url }}" title="{{ bookmark.url }}" rel="noreferrer">
                         {% if bookmark.starred == True %}
-                            <i class="material-icons">star</i>
+                            <i class="tiny material-icons yellow-text">star</i>
                         {% endif %}
                         {% if bookmark.title %}
                             {{ bookmark.title }}
                         {% else %}
                             [ no title ]
                         {% endif %}
-                    </a></p>
+                    </a>
+                    </div>
+                </div>
             </div>
             <div class="card-reveal green darken-3">
                 <span class="card-title white-text">Added @ {{ bookmark.created_date.strftime('%Y-%m-%d %H:%M') }}<i class="material-icons right">close</i></span>