diff --git a/public/dark.css b/public/dark.css
index 25c6d5b..64a5182 100644
--- a/public/dark.css
+++ b/public/dark.css
@@ -1,4 +1,4 @@
-body {
+body, .side {
   background-color: #262626;
   color: #ddd;
 }
diff --git a/public/style.css b/public/style.css
index 021fcbe..cf188a8 100644
--- a/public/style.css
+++ b/public/style.css
@@ -646,8 +646,10 @@ form.blockpost {
   margin: 0 auto;
   font-size: 12px;
   width: 300px;
-  padding-right: 5px;
+  padding: 0 5px;
   margin-bottom: 10px;
+  background-color: white;
+  border-radius: 0px 0px 0px 4px;
 }
 .side img, .md img{
   max-width: 100%;
@@ -660,9 +662,6 @@ main {
   display: block !important;
 }
 @media (min-width: 900px) {
-  .wide {
-    padding-right: 15px;
-  }
   .wide .side {
     display: none !important;
   }
@@ -680,14 +679,14 @@ main {
   }
   .side {
     display: block;
-    position: absolute;
-    top: 0;
-    right: 0;
+    float:right;
   }
   main {
-    padding-right: 316px;
     margin-right: 0px;
   }
+  main > .comment {
+    margin-right: 10px;
+  }
 }
 .side form {
   margin: 0px 0px 5px 0px;
diff --git a/templates/nav.html b/templates/nav.html
index 408ea73..faf9186 100644
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -89,7 +89,7 @@
         {{- end }}{{ end }}
         <form id="sidetoggle" class="link-btn{{ if .HideSidebar }} o{{end}}" method="POST">
           <input type="hidden" name="op" value="sidetoggle">
-          <button>{{ if .HideSidebar }}[+]{{ else }}[-]{{ end }}</button>
+          <button title="Toggle Sidebar">{{ if .HideSidebar }}[+]{{ else }}[-]{{ end }}</button>
         </form>
       </ul>
       {{- end }}
diff --git a/templates/sidebar.html b/templates/sidebar.html
index 930e2a1..56fb6ac 100644
--- a/templates/sidebar.html
+++ b/templates/sidebar.html
@@ -65,7 +65,7 @@
 {{- end -}}
 
 {{- if and .Site (not .Community) (not .User) }}
-  {{- if or .Site.SiteView.Site.Banner.IsValid .Site.SiteView.Site.Icon.IsValid }}
+  {{- if (or .Site.SiteView.Site.Banner.IsValid .Site.SiteView.Site.Icon.IsValid) }}
       <div class="banner" style="background-image: url({{ banner .Site.SiteView.Site }})"></div>
   {{- end }}
       <h1>{{ .Site.SiteView.Site.Name }}</h1>
@@ -85,7 +85,7 @@
 {{- end -}}
 
 {{- if .Community }}
-  {{- if or .Community.CommunityView.Community.Banner.IsValid .Community.CommunityView.Community.Icon.IsValid }}
+  {{- if (or .Community.CommunityView.Community.Banner.IsValid .Community.CommunityView.Community.Icon.IsValid) }}
       <div class="banner" style="background-image: url({{ cbanner .Community.CommunityView.Community }})"></div>
   {{- end }}
       <h1>{{ if ne .Community.CommunityView.Community.Title ""}}{{ .Community.CommunityView.Community.Title }}{{ else }}{{ .Community.CommunityView.Community.Name }}{{end}}</h1>