diff --git a/src/components/App.css b/src/components/App.css
index e2be959..1ed95f4 100644
--- a/src/components/App.css
+++ b/src/components/App.css
@@ -222,21 +222,26 @@ html, body {
   height: 100%;
   width: 100%;
 }
+.logger table {
+  width: 100%;
+}
+.logger td {
+  vertical-align: top;
+}
 .log-messages {
   overflow: auto;
   height: 100%;
 }
 .log-messages>* {
   overflow-wrap: anywhere;
-  display: flex;
 }
 .logger .msg {
   flex: 1 1 auto;
 }
 .logger .file {
-  float: right;
-  position: relative;
   user-select: none;
+  white-space: nowrap;
+  color: var(--link-color);
 }
 .tooltip {
   position: relative;
@@ -278,21 +283,22 @@ html, body {
   margin: 0 0.25em 0 0.25em;
   background-position: center center;
   background-repeat: no-repeat;
-  text-align: center;
   flex: 0 0 auto;
+  text-align: right;
+  white-space: nowrap;
+  user-select: none;
 }
 .logger .log .count,
 .logger .info .count,
 .logger .warn .count,
 .logger .error .count {
   border-radius: 0.5em;
-  vertical-align: middle;
-  line-height: 1em;
 }
 
 .logger .info .count {
   background: #666;
   color: #DDD;
+  color: var(--unselected-color);
 }
 .logger .warn {
   color: var(--warn-fg-color);
diff --git a/src/components/Log.js b/src/components/Log.js
index e932cfc..66ff073 100644
--- a/src/components/Log.js
+++ b/src/components/Log.js
@@ -105,25 +105,24 @@ export default class Log extends React.Component {
     return (
       <div className="logger">
         <div className="log-messages layout-scrollbar" ref={this.logMessagesRef}>
+          <table><tbody>
           { logManager.getMsgs().map((msg, ndx) => {
               const tooltip = !msg.section;
               return (
-                <div className={classNames('log-line',{[msg.type]: true})} key={`l${ndx}`}>
-                  <div className={msg.count ? "count" : "no-count"}>{msg.count ? msg.count : ''}</div>
-                  <div className="msg">
-                    {msg.msg}
-                    <span>&nbsp;</span> {/* this is to prevent auto-selection to the next element when double clicking */}
-                    <div
-                      className={classNames('file', {tooltip, fileLink: msg.section})}
-                      onClick={() => onGoToLine(msg)}
-                      data-tooltip={`${msg.section || msg.url}:${msg.lineNo}`}
-                    >
-                      {msg.section || basename(msg.url || '')}:{msg.lineNo}
-                    </div>
-                  </div>
-                </div>
+                <tr className={classNames('log-line',{[msg.type]: true})} key={`l${ndx}`}>
+                  <td className={msg.count ? "count" : "no-count"}>{msg.count ? msg.count : ''}</td>
+                  <td className="msg">{msg.msg}</td>
+                  <td
+                    className={classNames('file', {tooltip, fileLink: msg.section})}
+                    onClick={() => onGoToLine(msg)}
+                    data-tooltip={`${msg.section || msg.url}:${msg.lineNo}`}
+                  >
+                    {msg.section || basename(msg.url || '')}:{msg.lineNo}
+                  </td>
+                </tr>
               );
             })}
+          </tbody></table>
         </div>
       </div>
     );