diff --git a/css/vote.scss b/css/vote.scss
index 36283adc8c..88c2348271 100644
--- a/css/vote.scss
+++ b/css/vote.scss
@@ -240,6 +240,10 @@ th, tr, td {
     border: 1px solid #DDD;
     border-radius: 3px;
     margin-bottom: 10px;
+
+    &.new-comment {
+        border: none;
+    }
     
     .comment-header {
         background-color: #EEE;
@@ -252,7 +256,7 @@ th, tr, td {
         float: right;
         color: #555;
     }
-    
+	    
     .comment-content {
         padding: 5px;
     }
@@ -274,5 +278,9 @@ th, tr, td {
     }
 }
 
+#controls h2 {
+    margin-top: 12px;
+}
+
 
 
diff --git a/templates/create.tmpl.php b/templates/create.tmpl.php
index 29ce204627..f7a9160b50 100644
--- a/templates/create.tmpl.php
+++ b/templates/create.tmpl.php
@@ -38,14 +38,13 @@
 ?>
 
 <div id="app">
-	<?php include ("navigation.tmpl.php"); ?>
 	<div id="app-content">
         <div id="app-content-wrapper">
 			<div id="controls">
                 <div id="breadcrump">
                     <div class="crumb svg" data-dir="/">
                         <a href="<?php p($urlGenerator->linkToRoute('polls.page.index')); ?>">
-                            <img class="svg" src="../../../core/img/places/home.svg"" alt="Home">
+                            <img class="svg" src="<?php print_unescaped(OCP\image_path("core", "places/home.svg")); ?>" alt="Home">
                         </a>
                     </div>
                     <div class="crumb svg last">
diff --git a/templates/goto.tmpl.php b/templates/goto.tmpl.php
index bacd5d4d06..36bc46c0f3 100644
--- a/templates/goto.tmpl.php
+++ b/templates/goto.tmpl.php
@@ -54,7 +54,6 @@
 ?>
 
 <div id="app">
-	<?php include ("navigation.tmpl.php"); ?>
     <div id="app-content">
         <div id="app-content-wrapper" class="<?php p($layout); ?>">
 			<div id="controls">
@@ -62,7 +61,7 @@
                     <?php if(User::isLoggedIn()) : ?>
                     <div class="crumb svg" data-dir="/">
                         <a href="<?php p($urlGenerator->linkToRoute('polls.page.index')); ?>">
-                            <img class="svg" src="../../../../core/img/places/home.svg"" alt="Home">
+                            <img class="svg" src="<?php print_unescaped(OCP\image_path("core", "places/home.svg")); ?>"" alt="Home">
                         </a>
                     </div>
                     <div class="crumb svg last">
diff --git a/templates/main.tmpl.php b/templates/main.tmpl.php
index 511ead0e3c..b159219f11 100644
--- a/templates/main.tmpl.php
+++ b/templates/main.tmpl.php
@@ -11,14 +11,13 @@
     $urlGenerator = $_['urlGenerator'];
 ?>
 
-	<?php include ("navigation.tmpl.php"); ?>
     <div id="app-content">
         <div id="app-content-wrapper">
                 <div id="controls">
                     <div id="breadcrump">
                         <div class	="crumb svg last" data-dir="/">
                             <a href="<?php p($urlGenerator->linkToRoute('polls.page.index')); ?>">
-                                <img class="svg" src="../../../core/img/places/home.svg"" alt="Home">
+                                <img class="svg" src="<?php print_unescaped(OCP\image_path("core", "places/home.svg")); ?>" alt="Home">
                             </a>
                         </div>
                     </div>
diff --git a/templates/navigation.tmpl.php b/templates/navigation.tmpl.php
deleted file mode 100644
index 94f13ccbd1..0000000000
--- a/templates/navigation.tmpl.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<div id="app-navigation">
-</div>