diff --git a/static/partials/elements/log.html b/static/partials/elements/log.html
index 7d65706..c7d3e79 100644
--- a/static/partials/elements/log.html
+++ b/static/partials/elements/log.html
@@ -1,6 +1,7 @@
 <p class="log">
 
-    <span class="log__item log__time">
+    <span class="log__item log__time" ng-if="showDate != 0 && (showDate == 1 || log.show.date) ||
+                                             showTime != 0 && (showTime == 1 || log.show.time)">
         <span ng-if="showDate != 0 && (showDate == 1 || log.show.date)" class="log__time__higher">
             {{log.context.time | date: 'EEE MMM dd yyyy'}}
         </span>
@@ -9,14 +10,14 @@
         </span>
     </span>
 
-    <span class="log__item log__tags">
-        <span ng-if="showTags != 0 && (showTags == 1 || log.show.tags)">
+    <span class="log__item log__tags" ng-if="showTags != 0 && (showTags == 1 || log.show.tags)">
+        <span>
             <span ng-repeat="tag in log.context.tags" class="log__tag bck-tag">{{handleTags(tag)}}</span>
         </span>
     </span>
 
-    <span class="log__item log__location">
-        <span ng-if="showFile != 0 && (showFile == 1 || log.show.location)" class="bck-tag">
+    <span class="log__item log__location" ng-if="showFile != 0 && (showFile == 1 || log.show.location)" >
+        <span class="bck-tag">
             {{log.context.location.filename}}:{{log.context.location.line}}
         </span>
     </span>
diff --git a/static/style.css b/static/style.css
index 3f53ac7..1048096 100644
--- a/static/style.css
+++ b/static/style.css
@@ -447,8 +447,9 @@ body {
         display: table-cell;
         padding: 0 6px;
 
-        padding-right: 3px;
+        padding-right: 6px;
         text-align: left;
+        padding-left: 0;
 }
     .log__tags {
     background: #111;
@@ -473,6 +474,7 @@ body {
         /* top: -10px; */
         border-left: 1px solid #222;
         /* box-shadow: inset 2px 0 2px -2px #000; */
+        padding-left: 6px;
 }
     .log__json {
         white-space: pre-wrap;