diff --git a/static/partials/elements/log.html b/static/partials/elements/log.html
index b82a7d8..40c0225 100644
--- a/static/partials/elements/log.html
+++ b/static/partials/elements/log.html
@@ -1,4 +1,4 @@
-<p ng-class="{'log--collapse' : collapse == true, 'log': true}">
+<div ng-class="{'log--collapse' : collapse == true, 'log': true}">
 
     <span class="log__item log__number">
         {{number}}
@@ -11,12 +11,14 @@
         </span>
     </span>
 
-    <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">
+    <span class="log__item log__time log__time_80" ng-if="showDate != 0 && (showDate == 1 || log.show.date)">
+        <span  class="log__time__higher">
             {{log.context.time | date: 'EEE MMM dd yyyy'}}
         </span>
-        <span ng-if="showTime != 0 && (showTime == 1 || log.show.time)"  class="log__time__lower">
+    </span>
+
+    <span class="log__item log__time log__time_122" ng-if="showTime != 0 && (showTime == 1 || log.show.time)">
+        <span class="log__time__lower">
             {{log.context.time | date: 'yyyy-MM-ddTHH:mm:ss:Z'}}
         </span>
     </span>
@@ -41,4 +43,4 @@
         <span>{{log}}</span>
     </span>
 
-</p>
+</div>
diff --git a/static/style.css b/static/style.css
index adf3925..e0e7278 100644
--- a/static/style.css
+++ b/static/style.css
@@ -504,7 +504,7 @@ body {
         .log__message > span {
             display: block;
             overflow: hidden;
-            white-space: pre;
+            white-space: pre-wrap;
             font-size: 12px;
 }
         .log--collapse .log__message > span {
@@ -790,3 +790,11 @@ button.toggle-button.active {
 .checkbox input[type=checkbox]:checked + label:after {
   opacity: 1;
 }
+
+.log__time_80 {
+    min-width: 80px;
+}
+
+.log__time_122 {
+    min-width: 122px;
+}