diff --git a/templates/publicbookmarks.html b/templates/publicbookmarks.html
index d8f42ea..2a48206 100644
--- a/templates/publicbookmarks.html
+++ b/templates/publicbookmarks.html
@@ -30,7 +30,7 @@
         <div class="card horizontal tiny green darken-3">
             <div class="card-image">
                 {% if bookmark.favicon %}
-                    <img src="{{ url_for('static', filename='favicons/' + bookmark.favicon) }}" class="favicon" />&nbsp;
+                <div><img src="{{ url_for('static', filename='favicons/' + bookmark.favicon) }}" class="favicon" /></div>
                 {% endif %}
                 {% if bookmark.http_status != 200 %}
                     <i class="small material-icons red-text" title="HTTP status {{ bookmark.http_status }}">report_problem</i><br />
@@ -38,6 +38,9 @@
                 {% if bookmark.starred == True %}
                     <i class="small material-icons yellow-text">star</i>
                 {% endif %}
+                {% if bookmark.note %}
+                    <div><i class="small material-icons white-text" title="{{ bookmark.note|truncate(100) }}">comment</i></div>
+                {% endif %}
             </div>
             <div class="card-stacked">
                 <div class="card-content white-text">
@@ -49,7 +52,7 @@
                             {% if bookmark.title %}
                                 {{ bookmark.title }}
                             {% else %}
-                                [ no title ]
+                                {{ bookmark.get_uri_domain() }} (no title)
                             {% endif %}
                         </a>
                     </div>