diff --git a/frontend/js/app/openappsec-log/list-all/item.ejs b/frontend/js/app/openappsec-log/list-all/item.ejs
index 0d24ab1b..c4c09685 100644
--- a/frontend/js/app/openappsec-log/list-all/item.ejs
+++ b/frontend/js/app/openappsec-log/list-all/item.ejs
@@ -1,17 +1,17 @@
 <td class="text-right"><a href="#" class="meta btn btn-secondary btn-sm">open</a></td>
 <td class="text-nowrap"><%- formatDbDate(eventTime, 'MMM DD YYYY, H:mm') %></td>
-<td><%- eventSeverity %></td>
-<td><%- assetName %></td>
-<td><%- securityAction %></td>
-<td><%- waapIncidentType %></td>
-<td><%- httpSourceId %></td>
-<td><%- sourceIp %></td>
-<td><%- proxyIp %></td>
-<td><%- httpHostName %></td>
-<td><%- httpMethod %></td>
-<td><%- httpResponseCode %></td>
-<td><%- httpUriPath %></td>
-<td><%- eventTopic %></td>
-<td><%- matchedLocation %></td>
-<td><%- matchedParameter %></td>
-<td><%- matchedSample %></td>
\ No newline at end of file
+<%= createSpecificTableCell(eventSeverity) %>
+<%= createSpecificTableCell(assetName) %>
+<%= createSpecificTableCell(securityAction) %>
+<%= createSpecificTableCell(waapIncidentType) %>
+<%= createSpecificTableCell(httpSourceId) %>
+<%= createSpecificTableCell(sourceIP) %>
+<%= createSpecificTableCell(proxyIp) %>
+<%= createSpecificTableCell(httpHostName) %>
+<%= createSpecificTableCell(httpMethod) %>
+<%= createSpecificTableCell(httpResponseCode) %>
+<%= createSpecificTableCell(httpUriPath) %>
+<%= createSpecificTableCell(eventTopic) %>
+<%= createSpecificTableCell(matchedLocation) %>
+<%= createSpecificTableCell(matchedParameter) %>
+<%= createSpecificTableCell(matchedSample) %>
diff --git a/frontend/js/app/openappsec-log/list-all/item.js b/frontend/js/app/openappsec-log/list-all/item.js
index 009e3a3e..a65006f0 100644
--- a/frontend/js/app/openappsec-log/list-all/item.js
+++ b/frontend/js/app/openappsec-log/list-all/item.js
@@ -27,6 +27,14 @@ module.exports = Mn.View.extend({
             }
 
             return '#' + (this.object_id || '?');
+        },
+        createSpecificTableCell: function(value) {
+            if (value && value.trim() !== '') {
+                return `<td>${value}</td>`;
+            } else {
+                return `<td class="text-center">-</td>`;
+            }
         }
+        
     }
 });
diff --git a/frontend/js/app/openappsec-log/list-important/item.ejs b/frontend/js/app/openappsec-log/list-important/item.ejs
index d038f03d..266b9597 100644
--- a/frontend/js/app/openappsec-log/list-important/item.ejs
+++ b/frontend/js/app/openappsec-log/list-important/item.ejs
@@ -1,17 +1,17 @@
 <td class="text-right"><a href="#" class="meta btn btn-secondary btn-sm">open</a></td>
 <td class="text-nowrap"><%- formatDbDate(eventTime, 'MMM DD YYYY, H:mm') %></td>
-<td><%- eventSeverity %></td>
-<td><%- assetName %></td>
-<td><%- securityAction %></td>
-<td><%- waapIncidentType %></td>
-<td><%- httpSourceId %></td>
-<td><%- sourceIp %></td>
-<td><%- proxyIp %></td>
-<td><%- httpHostName %></td>
-<td><%- httpMethod %></td>
-<td><%- httpResponseCode %></td>
-<td><%- httpUriPath %></td>
-<td><%- eventTopic %></td>
-<td><%- matchedLocation %></td>
-<td><%- matchedParameter %></td>
-<td><%- matchedSample %></td>
+<%= createSpecificTableCell(eventSeverity) %>
+<%= createSpecificTableCell(assetName) %>
+<%= createSpecificTableCell(securityAction) %>
+<%= createSpecificTableCell(waapIncidentType) %>
+<%= createSpecificTableCell(httpSourceId) %>
+<%= createSpecificTableCell(sourceIP) %>
+<%= createSpecificTableCell(proxyIp) %>
+<%= createSpecificTableCell(httpHostName) %>
+<%= createSpecificTableCell(httpMethod) %>
+<%= createSpecificTableCell(httpResponseCode) %>
+<%= createSpecificTableCell(httpUriPath) %>
+<%= createSpecificTableCell(eventTopic) %>
+<%= createSpecificTableCell(matchedLocation) %>
+<%= createSpecificTableCell(matchedParameter) %>
+<%= createSpecificTableCell(matchedSample) %>
\ No newline at end of file
diff --git a/frontend/js/app/openappsec-log/list-important/item.js b/frontend/js/app/openappsec-log/list-important/item.js
index 009e3a3e..22a358e5 100644
--- a/frontend/js/app/openappsec-log/list-important/item.js
+++ b/frontend/js/app/openappsec-log/list-important/item.js
@@ -27,6 +27,13 @@ module.exports = Mn.View.extend({
             }
 
             return '#' + (this.object_id || '?');
+        },
+        createSpecificTableCell: function(value) {
+            if (value && value.trim() !== '') {
+                return `<td>${value}</td>`;
+            } else {
+                return `<td class="text-center">-</td>`;
+            }
         }
     }
 });
diff --git a/frontend/js/app/openappsec-log/list-notifications/item.ejs b/frontend/js/app/openappsec-log/list-notifications/item.ejs
index 2c64efd4..f97a9c49 100644
--- a/frontend/js/app/openappsec-log/list-notifications/item.ejs
+++ b/frontend/js/app/openappsec-log/list-notifications/item.ejs
@@ -1,8 +1,8 @@
 <td class="text-right"><a href="#" class="meta btn btn-secondary btn-sm">open</a></td>
 <td class="text-nowrap"><%- formatDbDate(eventTime, 'MMM DD YYYY, H:mm') %></td>
-<td><%- eventSeverity %></td>
-<td><%- eventPriority %></td>
-<td><%- eventTopic %></td>
-<td><%- eventName %></td>
-<td><%- suggestedRemediation %></td>
-<td><%- assetName %></td>
\ No newline at end of file
+<%= createSpecificTableCell(eventSeverity) %>
+<%= createSpecificTableCell(eventPriority) %>
+<%= createSpecificTableCell(eventTopic) %>
+<%= createSpecificTableCell(eventName) %>
+<%= createSpecificTableCell(suggestedRemediation) %>
+<%= createSpecificTableCell(assetName) %>
\ No newline at end of file
diff --git a/frontend/js/app/openappsec-log/list-notifications/item.js b/frontend/js/app/openappsec-log/list-notifications/item.js
index 009e3a3e..22a358e5 100644
--- a/frontend/js/app/openappsec-log/list-notifications/item.js
+++ b/frontend/js/app/openappsec-log/list-notifications/item.js
@@ -27,6 +27,13 @@ module.exports = Mn.View.extend({
             }
 
             return '#' + (this.object_id || '?');
+        },
+        createSpecificTableCell: function(value) {
+            if (value && value.trim() !== '') {
+                return `<td>${value}</td>`;
+            } else {
+                return `<td class="text-center">-</td>`;
+            }
         }
     }
 });
diff --git a/frontend/js/login/ui/login.ejs b/frontend/js/login/ui/login.ejs
index 925bc1b1..3f603acf 100644
--- a/frontend/js/login/ui/login.ejs
+++ b/frontend/js/login/ui/login.ejs
@@ -7,14 +7,24 @@
                         <div class="row">
                             <div class="col-sm-12 col-md-6">
                                 <div class="text-center p-1">
+                                    <div class="text-center">
                                     <img src="/images/logo-text-vertical-grey.png" alt="Logo" />
-                                    <div class="text-center text-muted mt-5">
-                                        <%- i18n('main', 'version', {version: getVersion()}) %>
+                                    <div class="text-center text-muted my-5">
+                                        <%- i18n('main', 'version' , {version: getVersion()}) %>
                                     </div>
-                                    <div class="mt-5">
-                                        <span class="small mr-3 text-nowrap">Secured by:</span>
-                                        <img src="/images/open-appsec-logo.svg" border="0" width="29" class="mr-2">
-                                        <span class="mr-sm-0 mr-md-4 my-0 align-middle text-nowrap" style="font-family: Open Sans;">open-appsec</span>
+                                    
+                                    <div class="d-flex position-relative justify-content-center">
+                                        <div class="position-absolute" style="left: 55px;">
+                                            <span class="small pr-1">Secured by:</span>
+                                        </div>
+                                        <div class="mx-auto">
+                                            <img src="/images/open-appsec-logo.svg" border="0" width="29">
+                                        </div>
+                                        <div class="position-absolute" style="right: 35px;">
+                                            <span class="pl-2 align-middle" style="font-family: Open Sans;">open-appsec</span>
+                                        </div>
+                                    </div>
+                                    
                                     </div>
                                 </div>
                             </div>
diff --git a/frontend/js/models/openappsec-log.js b/frontend/js/models/openappsec-log.js
index 5f057538..9ee4c05c 100755
--- a/frontend/js/models/openappsec-log.js
+++ b/frontend/js/models/openappsec-log.js
@@ -5,30 +5,30 @@ const model = Backbone.Model.extend({
 
     defaults: function () {
         return {
-            name: '-',
-            eventSeverity: '-',
-            assetName: '-',
-            securityAction: '-',
-            waapIncidentType: '-',
-            httpSourceId: '-',
-            sourceIp: '-',
-            // 'Proxy-IP': '-',
-            proxyIp: '-',
-            httpHostName: '-',
-            httpMethod: '-',
-            // 'HTTP-Response-Code': '-',
-            httpResponseCode: '-',
-            httpUriPath: '-',
-            // 'Protection-Name': '-',
-            protectionName: '-',
-            matchedLocation: '-',
-            matchedParameter: '-',
-            matchedSample: '-',
-            eventPriority: '-',
-            eventTopic: '-',
-            eventName: '-',
+            name: '',
+            eventSeverity: '',
+            assetName: '',
+            securityAction: '',
+            waapIncidentType: '',
+            httpSourceId: '',
+            sourceIP: '',
+            // 'Proxy-IP': '',
+            proxyIp: '',
+            httpHostName: '',
+            httpMethod: '',
+            // 'HTTP-Response-Code': '',
+            httpResponseCode: '',
+            httpUriPath: '',
+            // 'Protection-Name': '',
+            protectionName: '',
+            matchedLocation: '',
+            matchedParameter: '',
+            matchedSample: '',
+            eventPriority: '',
+            eventTopic: '',
+            eventName: '',
             // Suggested Remediation if Applicable
-            suggestedRemediation: '-'
+            suggestedRemediation: ''
         };
     }
 });