diff --git a/static/js/init.js b/static/js/init.js
index 1112054..1d94bbe 100644
--- a/static/js/init.js
+++ b/static/js/init.js
@@ -3,5 +3,10 @@
 
     $('.sidenav').sidenav();
 
+    /* Initialise collapsible tags block */
+    $(document).ready(function() {
+        $('.collapsible').collapsible();
+    });
+
   }); // end of document ready
 })(jQuery); // end of jQuery name space
diff --git a/templates/edit.html b/templates/edit.html
index 27881ea..d5613d1 100644
--- a/templates/edit.html
+++ b/templates/edit.html
@@ -113,13 +113,17 @@
 
         <div class="col s12">
             {#<i class="material-icons prefix">star</i>#}
-            <input type="checkbox" name="starred" id="starred" {% if bookmark.starred == True %}checked{% endif %} />
-            <label for="starred">Starred</label>
+            <label>
+                <input type="checkbox" name="starred" id="starred" {% if bookmark.starred == True %}checked{% endif %} />
+                <span>Starred</span>
+            </label>
         </div>
 
         <div class="col s12">
-            <input type="checkbox" name="strip" id="strip" />
-            <label for="strip">Strip parameters from url (like <em>?utm_source=social</em> - can break the link!)</label>
+            <label>
+                <input type="checkbox" name="strip" id="strip" />
+                <span>Strip parameters from url (like <em>?utm_source=social</em> - can break the link!)</span>
+            </label>
         </div>
 
     {% if bookmark.url_hash %}