diff --git a/templates/completed.html b/templates/completed.html
index dd56de5..0d8774f 100644
--- a/templates/completed.html
+++ b/templates/completed.html
@@ -4,7 +4,7 @@
     {{ if .Tasks}} {{range $key, $value := .Tasks}}
     <div class="note">
         <p class="noteHeading">{{$value.Title}}</p> <span class="toggle glyphicon glyphicon-resize-full"></span>
-        <span class="noteContent">{{$value.Content}}</span>
+        <span class="noteContent">{{$value.ContentHTML}}</span>
         <span class="notefooter">
             <ul class="menu">
                 <li role="presentation">Priority: {{$value.Priority}}</li>
@@ -36,4 +36,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/templates/deleted.html b/templates/deleted.html
index 37924de..986ea0f 100644
--- a/templates/deleted.html
+++ b/templates/deleted.html
@@ -39,8 +39,8 @@
     </div>
     {{end}}
 </div>
-{{template "footer.html"}}
+{{template "_footer.html"}}
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/templates/search.html b/templates/search.html
index 4e41af9..5edfa4b 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -6,7 +6,7 @@
         <p class="noteHeading">{{ $value.Title}}{{if $value.IsOverdue}}<span class="overdue">Overdue</span>{{end}}</p> <span class="toggle glyphicon glyphicon-resize-full"></span>
 
         <span class="noteContent">
-            {{$value.Content}}
+            {{$value.ContentHTML}}
                  <div class="commentslist">
                     {{range $value.Comments}}
                     <div class="comment">
@@ -69,4 +69,4 @@
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/views/views.go b/views/views.go
index 52b773d..2c189a8 100644
--- a/views/views.go
+++ b/views/views.go
@@ -4,6 +4,7 @@ package views
 
 import (
 	"html/template"
+	"log"
 	"net/http"
 	"time"
 
@@ -28,6 +29,7 @@ func ShowAllTasksFunc(w http.ResponseWriter, r *http.Request) {
 	if r.Method == "GET" {
 		username := sessions.GetCurrentUserName(r)
 		context, err := db.GetTasks(username, "pending", "")
+		log.Println(context)
 		categories := db.GetCategories(username)
 		if err != nil {
 			http.Redirect(w, r, "/", http.StatusInternalServerError)
@@ -60,7 +62,10 @@ func ShowTrashTaskFunc(w http.ResponseWriter, r *http.Request) {
 			context.Message = message
 			message = ""
 		}
-		deletedTemplate.Execute(w, context)
+		err = deletedTemplate.Execute(w, context)
+		if err != nil {
+			log.Fatal(err)
+		}
 	}
 }