diff --git a/public/templates/completed.html b/public/templates/completed.html
index 1f525ae..744db82 100644
--- a/public/templates/completed.html
+++ b/public/templates/completed.html
@@ -30,7 +30,10 @@
       </span>
     </div>
     {{end}} {{else}}
-    <p>No tasks here</p>
+    <div class="note">
+      <p class="noteHeading">No Tasks here</p>
+      <p class="notefooter">Go to home page <a href="/">here</a> </p>
+    </div>
     {{end}}
   </div>
 	{{template "_footer.gtpl"}}
diff --git a/public/templates/deleted.html b/public/templates/deleted.html
index d365751..8991d7c 100644
--- a/public/templates/deleted.html
+++ b/public/templates/deleted.html
@@ -6,49 +6,6 @@
 </a>
 {{end}}
 
-<!-- Add note modal -->
-<div class="modal fade " id="addNoteModal" tabindex="-1" role="dialog" aria-labelledby="newNoteLabel" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title" id="newNoteLabel"><span class="glyphicon glyphicon-pencil"></span>  New Task</h4>
-      </div>
-      <div class="modal-body">
-        <form>
-          <div class="form-group">
-            <!-- <label for="note-title" class="control-label">Title:</label> -->
-            <input type="text" class="form-control" id="add-note-title" placeholder="Title" style="border:none;border-bottom:1px solid gray; box-shadow:none;">
-          </div>
-          <div class="form-group">
-            <!-- <label for="note-content" class="control-label">Content:</label> -->
-            <textarea class="form-control" id="add-note-content" placeholder="Content" rows="10" style="border:none;border-bottom:1px solid gray; box-shadow:none;"></textarea>
-          </div>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        <button type="button" class="btn btn-primary" id="addNoteModalSaveBtn">Save</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-<!-- modal for opening note -->
-<div class="modal fade" id="openNoteModal" tabindex="-1" role="dialog" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button class="close" data-dismiss="modal"> &times;</button>
-        <h4 class="modal-title"></h4>
-      </div>
-      <div class="modal-body">
-
-      </div>
-    </div>
-  </div>
-</div>
-
 <div class="timeline">
   {{ if .}} {{range .}}
   <div class="note">
@@ -56,10 +13,10 @@
     <hr>
     <p class="noteContent">{{.Content}}</p>
     <span class="notefooter">
-                    <ul class="menu">
-                     <!-- <li role="presentation">
-                          <a role="menuitem" tabindex="-1" href="/share/{{.Id}}">
-                          <span class="glyphicon glyphicon-share"></span> Share</a>
+      <ul class="menu">
+        <!-- <li role="presentation">
+            <a role="menuitem" tabindex="-1" href="/share/{{.Id}}">
+            <span class="glyphicon glyphicon-share"></span> Share</a>
     </li>
     <li role="presentation">
       <a role="menuitem" tabindex="-1" href="/mask/{{.Id}}">
@@ -81,7 +38,10 @@
     </span>
   </div>
   {{end}} {{else}}
-  <p>No tasks here</p>
+  <div class="note">
+      <p class="noteHeading">No Tasks here</p>
+      <p class="notefooter">Go to home page <a href="/">here</a> </p>
+    </div>
   {{end}}
 </div>
 {{template "footer.gtpl"}}
diff --git a/public/templates/home.html b/public/templates/home.html
index 8a7c6c1..a90080f 100755
--- a/public/templates/home.html
+++ b/public/templates/home.html
@@ -40,7 +40,6 @@
       <span class="notefooter">
                     <ul class="menu">
                       <li role="presentation">
-                          <!-- <a role="menuitem" tabindex="-1" href="/share/{{.Id}}"> </a>-->
                           <span class="glyphicon glyphicon-time"></span> {{.Created}}</li>
       <!--  <li role="presentation">
                           <a role="menuitem" tabindex="-1" href="/mask/{{.Id}}">
@@ -62,7 +61,10 @@
       </span>
     </div>
     {{end}} {{else}}
-    <p>No tasks here</p>
+    <div class="note">
+      <p class="noteHeading">No Tasks here</p>
+      <p class="notefooter">Create new task<button class="floating-action-icon-add" style="border:none;border-bottom:1px solid gray; box-shadow:none;"> here </button> </p>
+    </div>
     {{end}}
   </div>
 	{{template "footer.gtpl"}}
diff --git a/public/templates/search.html b/public/templates/search.html
index 3c445e7..71f2b08 100644
--- a/public/templates/search.html
+++ b/public/templates/search.html
@@ -10,10 +10,10 @@
       <hr>
       <p class="noteContent">{{.Content}}</p>
       <span class="notefooter">
-                    <ul class="menu">
-                     <!-- <li role="presentation">
-                          <a role="menuitem" tabindex="-1" href="/share/{{.Id}}">
-                          <span class="glyphicon glyphicon-share"></span> Share</a>
+        <ul class="menu">
+          <!-- <li role="presentation">
+              <a role="menuitem" tabindex="-1" href="/share/{{.Id}}">
+              <span class="glyphicon glyphicon-share"></span> Share</a>
       </li>
       <li role="presentation">
         <a role="menuitem" tabindex="-1" href="/mask/{{.Id}}">
@@ -35,7 +35,10 @@
       </span>
     </div>
     {{end}} {{else}}
-    <p>No match found</p>
+    <div class="note">
+      <p class="noteHeading">No results found</p>
+      <p class="notefooter">Go to home page <a href="/">here</a> </p>
+    </div>
     {{end}}
   </div>
   {{template "_footer.gtpl"}}