diff --git a/Gruntfile.js b/Gruntfile.js
index eb7bd31..77cf541 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -62,7 +62,8 @@ module.exports = function(grunt) {
             all: {
                 options: {
                     urls: ['http://localhost:<%= connect.test.options.port %>/test/new-unit/index.html'],
-                    run: false
+                    run: false,
+                    timeout: 20000
                 }
             }
         }
diff --git a/src/tpl/read.html b/src/tpl/read.html
index 22ef396..e6158c0 100644
--- a/src/tpl/read.html
+++ b/src/tpl/read.html
@@ -10,7 +10,7 @@
   <div class="circle">
     <div class="icon-delete"></div>
   </div>
-</div>
+</div><!--/.buttons-->
 
 <div class="read-message">
   <p class="subject">{{selected.subject}}</p>
@@ -24,11 +24,11 @@
         CC: <span class="address" ng-repeat="t in selected.cc">{{t.address}} </span>
       </p>
     </div>
-  </div>
+  </div><!--/.address-headers-->
 
   <div class="seperator-line"></div>
 
   <div class="body">
     <p ng-repeat="part in selected.bodyDisplayParts">{{part}}</p>
   </div>
-</div>
\ No newline at end of file
+</div><!--/.read-message-->
\ No newline at end of file