diff --git a/public/templates/completed.html b/public/templates/completed.html
index 41baea6..5c3a016 100644
--- a/public/templates/completed.html
+++ b/public/templates/completed.html
@@ -3,18 +3,17 @@
   <div class="timeline">
     {{ if .Tasks}} {{range .Tasks}}
     <div class="note">
-      <p class="noteHeading">{{.Title}}</p>
-      <hr>
+      <p class="noteHeading">{{.Title}}</p> <span class="toggle glyphicon glyphicon-resize-full"></span>
       <p class="noteContent">{{.Content}}</p>
       <span class="notefooter">
                     <ul class="menu">
                       <li role="presentation">
                           <a role="menuitem" tabindex="-1" href="/incomplete/{{.Id}}">
-                          <span class="glyphicon glyphicon-share"></span> Mark incomplete</a>
+                          <span class="glyphicon glyphicon-eye-close"></span></a>
                       </li>
                     <li role="presentation">
                       <a role="menuitem" tabindex="-1" href="/trash/{{.Id}}">
-                        <span class="glyphicon glyphicon-trash"></span> Trash</a>
+                        <span class="glyphicon glyphicon-trash"></span></a>
                     </li>
       <!--<li role="presentation">
         <a role="menuitem" tabindex="-1" href="/mask/{{.Id}}">
diff --git a/public/templates/deleted.html b/public/templates/deleted.html
index 5572567..41cb49b 100644
--- a/public/templates/deleted.html
+++ b/public/templates/deleted.html
@@ -9,8 +9,7 @@
 <div class="timeline">
   {{ if .Tasks}} {{range .Tasks}}
   <div class="note">
-    <p class="noteHeading">{{.Title}}</p>
-    <hr>
+    <p class="noteHeading">{{.Title}}</p> <span class="toggle glyphicon glyphicon-resize-full"></span>
     <p class="noteContent">{{.Content}}</p>
     <span class="notefooter">
       <ul class="menu">
@@ -28,11 +27,11 @@
     </li>!-->
     <li role="presentation">
       <a role="menuitem" tabindex="-1" href="/delete/{{.Id}}">
-        <span class="glyphicon glyphicon-trash"></span> Delete</a>
+        <span class="glyphicon glyphicon-trash"></span></a>
     </li>
     <li role="presentation">
       <a role="menuitem" tabindex="-1" href="/restore/{{.Id}}">
-        <span class="glyphicon glyphicon-inbox"></span> Restore</a>
+        <span class="glyphicon glyphicon-inbox"></span></a>
     </li>
     </ul>
     </span>
diff --git a/public/templates/home.html b/public/templates/home.html
index 4c5bdba..ec19bef 100644
--- a/public/templates/home.html
+++ b/public/templates/home.html
@@ -16,6 +16,7 @@
             <div class="form-group">
               <!-- <label for="note-title" class="control-label">Title:</label> -->
               <input type="text" name="title" class="form-control" id="add-note-title" placeholder="Title" style="border:none;border-bottom:1px solid gray; box-shadow:none;">
+              <input type="hidden" name="CSRFToken" value={{.CSRFToken}}>
             </div>
             <div class="form-group">
               <!-- <label for="note-content" class="control-label">Content:</label> -->
@@ -43,18 +44,18 @@
                           <span class="glyphicon glyphicon-time"></span> {{.Created}}</li>
         <li role="presentation">
                           <a role="menuitem" tabindex="-1" href="/mask/{{.Id}}">
-						  <span class="glyphicon glyphicon-lock"></span> Mask</a></li> 
+						  <span class="glyphicon glyphicon-lock"></span></a></li> 
       <li role="presentation">
         <a role="menuitem" tabindex="-1" href="/trash/{{.Id}}">
-          <span class="glyphicon glyphicon-trash"></span> Trash</a>
+          <span class="glyphicon glyphicon-trash"></span></a>
       </li>
       <li role="presentation">
         <a role="menuitem" tabindex="-1" href="/complete/{{.Id}}">
-          <span class="glyphicon glyphicon-check"></span> Complete</a>
+          <span class="glyphicon glyphicon-check"></span></a>
       </li>
       <li role="presentation">
         <a role="menuitem" tabindex="-1" href="/edit/{{.Id}}">
-          <span class="glyphicon glyphicon-pencil"></span> Edit</a>
+          <span class="glyphicon glyphicon-pencil"></span></a>
       </li>
 
       </ul>
@@ -67,7 +68,7 @@
     </div>
     {{end}}
   </div>
-	{{template "footer.gtpl"}}
+	{{template "_footer.html" .}}
 
 </body>
 
diff --git a/public/templates/search.html b/public/templates/search.html
index 9031d11..764f80b 100644
--- a/public/templates/search.html
+++ b/public/templates/search.html
@@ -2,8 +2,7 @@
   <div class="timeline">
     {{ if .Tasks}} {{range .Tasks}}
     <div class="note">
-      <p class="noteHeading">{{.Title}}</p>
-      <hr>
+      <p class="noteHeading">{{.Title}}</p> <span class="toggle glyphicon glyphicon-resize-full"></span>
       <p class="noteContent">{{.Content}}</p>
       <span class="notefooter">
                     <ul class="menu">
@@ -14,15 +13,15 @@
 						  <span class="glyphicon glyphicon-lock"></span> Mask</a></li> !-->
       <li role="presentation">
         <a role="menuitem" tabindex="-1" href="/trash/{{.Id}}">
-          <span class="glyphicon glyphicon-trash"></span> Trash</a>
+          <span class="glyphicon glyphicon-trash"></span></a>
       </li>
       <li role="presentation">
         <a role="menuitem" tabindex="-1" href="/complete/{{.Id}}">
-          <span class="glyphicon glyphicon-check"></span> Complete</a>
+          <span class="glyphicon glyphicon-check"></span></a>
       </li>
       <li role="presentation">
         <a role="menuitem" tabindex="-1" href="/edit/{{.Id}}">
-          <span class="glyphicon glyphicon-pencil"></span> Edit</a>
+          <span class="glyphicon glyphicon-pencil"></span></a>
       </li>
 
       </ul>