diff --git a/public/static/css/styles.css b/public/static/css/styles.css
index 80f8766..5a8a990 100644
--- a/public/static/css/styles.css
+++ b/public/static/css/styles.css
@@ -107,7 +107,7 @@ Navbar
   margin-left: 25px;
   font-size:1.5em;
   color:white;
-
+  max-width: 2000px;
 }
 
 .btn-action{
diff --git a/templates/_head.html b/templates/_head.html
index 68ca833..724d4b9 100644
--- a/templates/_head.html
+++ b/templates/_head.html
@@ -70,6 +70,7 @@
 					{{ else if eq .Navigation "completed"}}
 					{{ else if eq .Navigation "deleted"}}
 					{{ else if eq .Navigation "edit"}} 
+                    {{ else if eq .Navigation "search"}}
                     {{else }}
                    <a href="/del-category/{{.Navigation}}"> <button  data-original-title="Delete Category" data-placement="bottom" data-toggle="tooltip" title="" class="btn btn-action glyphicon glyphicon-trash"  type="button"></button></a>
                    <button  data-original-title="Edit Category" data-placement="bottom" data-toggle="tooltip" id="editCatFrmBtn" title="" class="btn btn-action glyphicon glyphicon-pencil"  type="button"></button>
diff --git a/templates/search.html b/templates/search.html
index 97fa1f1..e7655ae 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -1,43 +1,71 @@
 {{template "_head.html" .}}
-<div class="timeline">
-    {{ if .Tasks}} 
-    {{range .Tasks}}
-    <div class="note">
-        <p class="noteHeading">{{.Title}}</p> <span class="toggle glyphicon glyphicon-resize-full"></span>
-        <span class="noteContent">{{.Content}}</span>
-        <span class="notefooter">
-        <ul class="menu">
-          <li role="presentation">Priority: {{.Priority}}</li>
-          <li role="presentation">
-              <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> !-->
-        <li role="presentation">
-            <a role="menuitem" tabindex="-1" href="/trash/{{.Id}}">
-                <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></a>
-        </li>
-        <li role="presentation">
-            <a role="menuitem" tabindex="-1" href="/edit/{{.Id}}">
-                <span class="glyphicon glyphicon-pencil"></span></a>
-        </li>
 
-        </ul>
-        </span>
-    </div>
-    {{end}} {{else}}
-    <div class="note">
-        <p class="noteHeading">No results found</p>
-        <p class="notefooter">Go to home page <a href="/">here</a> </p>
+<div class="timeline">
+    {{ if .Tasks}} {{range $key, $value := .Tasks}}
+    <div class="note" id="{{$value.Id}}">
+        <p class="noteHeading">{{ $value.Title}}</p> <span class="toggle glyphicon glyphicon-resize-full"></span>
+
+        <span class="noteContent">
+            {{$value.Content}}
+                 <div class="commentslist">
+                    {{range $value.Comments}}
+                    <div class="comment">
+                        <span>{{.Content}}</span>
+        <span class="timestamp">{{.Created}}</span>
+        <a href="/del-comment/{{.ID}}"><span class="glyphicon glyphicon-trash timestamp"></span></a>
     </div>
     {{end}}
-</div>
-{{template "_footer.html"}}
 
+    <div class="comment">
+        <form method="POST" action="/add-comment/">
+            <textarea rows="1" cols="75" name="commentText" placeholder="Add Comment"></textarea>
+            <input type="text" class="hidden" name="taskID" value="{{$value.Id}}">
+            <input type="submit" value="Comment" class="btn btn-primary" />
+        </form>
+    </div>
+</div>
+</span>
+
+<span class="notefooter">
+        <ul class="menu">
+          <li role="presentation">Priority: {{$value.Priority}}</li>
+          <li role="presentation">
+              <span class="glyphicon glyphicon-time"></span> {{$value.Created}}</li>
+<li role="presentation">
+
+    <a role="menuitem" tabindex="-1" href="/mask/{{.Id}}">
+        <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></a>
+</li>
+<li role="presentation">
+    <a role="menuitem" tabindex="-1" href="/complete/{{.Id}}">
+        <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></a>
+</li>
+<li role="presentation">
+    <a href="/category/{{$value.Category}}"> {{$value.Category}}</a>
+</li>
+</ul>
+</span>
+</div>
+{{end}} {{else}}
+<div class="note">
+    <p class="noteHeading">No Tasks here</p>
+    <p class="notefooter">Create new task
+        <button class="floating-action-icon-add">
+            here </button>
+    </p>
+</div>
+{{end}}
+</div>
+
+{{template "_footer.html"}}
 
 </body>
 
diff --git a/views/otherViews.go b/views/otherViews.go
index 9410675..62db302 100644
--- a/views/otherViews.go
+++ b/views/otherViews.go
@@ -79,7 +79,12 @@ func SearchTaskFunc(w http.ResponseWriter, r *http.Request) {
 	if r.Method == "POST" {
 		r.ParseForm()
 		query := r.Form.Get("query")
+
 		context := db.SearchTask(query)
+
+		categories := db.GetCategories()
+		context.Categories = categories
+
 		searchTemplate.Execute(w, context)
 	} else {
 		message = "Method not allowed"