diff --git a/dashboard/public/views/eventlog.html b/dashboard/public/views/eventlog.html
index 35b92bcbd..b5023aa9a 100644
--- a/dashboard/public/views/eventlog.html
+++ b/dashboard/public/views/eventlog.html
@@ -1,47 +1,45 @@
 
 <div>
-  <div class="col-md-12">
-    <h1>{{ 'eventlog.title' | tr }}</h1>
+  <h1>{{ 'eventlog.title' | tr }}</h1>
 
-    <div class="eventlog-filter">
-      <input type="text" class="form-control" style="min-width: 350px;" ng-model="search" ng-model-options="{ debounce: 1000 }" ng-change="updateFilter()" placeholder="{{ 'main.searchPlaceholder' | tr }}"/>
-      <multiselect ng-model="selectedActions" ms-header="{{ 'eventlog.filterAllEvents' | tr }}" options="a.name for a in actions" data-multiple="true"  ng-change="updateFilter(true)" filter-after-rows="5" scroll-after-rows="10"></multiselect>
-      <select class="form-control" ng-model="pageItems" ng-options="a.name for a in pageItemCount" ng-change="updateFilter(true)"></select>
-      <!-- <select class="form-control" ng-model="action" ng-options="a.name for a in actions" ng-change="updateFilter()">
-        <option value="">-- All actions --</option>
-      </select> -->
-      <div style="flex-grow: 1;"></div>
-      <button class="btn btn-default btn-outline" ng-click="refresh()"><i class="fas fa-sync-alt" ng-class="{ 'fa-spin': busyRefresh }"></i></button>
-      <button class="btn btn-default btn-outline" ng-click="showPrevPage()" ng-disabled="busy || currentPage <= 1"><i class="fa fa-angle-double-left"></i> {{ 'main.pagination.prev' | tr }}</button>
-      <button class="btn btn-default btn-outline" ng-click="showNextPage()" ng-disabled="busy || pageItems.value > eventLogs.length">{{ 'main.pagination.next' | tr }} <i class="fa fa-angle-double-right"></i></button>
-    </div>
+  <div class="eventlog-filter">
+    <input type="text" class="form-control" style="min-width: 350px;" ng-model="search" ng-model-options="{ debounce: 1000 }" ng-change="updateFilter()" placeholder="{{ 'main.searchPlaceholder' | tr }}"/>
+    <multiselect ng-model="selectedActions" ms-header="{{ 'eventlog.filterAllEvents' | tr }}" options="a.name for a in actions" data-multiple="true"  ng-change="updateFilter(true)" filter-after-rows="5" scroll-after-rows="10"></multiselect>
+    <select class="form-control" ng-model="pageItems" ng-options="a.name for a in pageItemCount" ng-change="updateFilter(true)"></select>
+    <!-- <select class="form-control" ng-model="action" ng-options="a.name for a in actions" ng-change="updateFilter()">
+      <option value="">-- All actions --</option>
+    </select> -->
+    <div style="flex-grow: 1;"></div>
+    <button class="btn btn-default btn-outline" ng-click="refresh()"><i class="fas fa-sync-alt" ng-class="{ 'fa-spin': busyRefresh }"></i></button>
+    <button class="btn btn-default btn-outline" ng-click="showPrevPage()" ng-disabled="busy || currentPage <= 1"><i class="fa fa-angle-double-left"></i> {{ 'main.pagination.prev' | tr }}</button>
+    <button class="btn btn-default btn-outline" ng-click="showNextPage()" ng-disabled="busy || pageItems.value > eventLogs.length">{{ 'main.pagination.next' | tr }} <i class="fa fa-angle-double-right"></i></button>
+  </div>
 
-    <div class="card card-block" style="max-width: 100%">
-      <div>
-        <center ng-show="busy"><h2><i class="fa fa-circle-notch fa-spin"></i></h2></center>
-        <table ng-hide="busy" class="table table-condensed table-hover">
-          <thead>
-            <tr>
-              <th class="col-md-2">{{ 'eventlog.time' | tr }}</th>
-              <th class="col-md-2">{{ 'eventlog.source' | tr }}</th>
-              <th class="col-md-8">{{ 'eventlog.details' | tr }}</th>
-            </tr>
-          </thead>
-          <tbody ng-repeat="eventLog in eventLogs">
-            <tr ng-click="showEventLogDetails(eventLog)" class="hand">
-              <td><span uib-tooltip="{{ eventLog.raw.creationTime | prettyLongDate }}" class="arrow">{{ eventLog.raw.creationTime | prettyDate }}</span></td>
-              <td>{{ eventLog.source }}</td>
-              <td ng-bind-html="eventLog.details"></td>
-            </tr>
-            <tr ng-show="activeEventLog === eventLog">
-              <td colspan="4">
-                <p ng-show="eventLog.raw.source.ip">Source IP: <code>{{ eventLog.raw.source.ip }}</code></p>
-                <pre class="eventlog-details">{{ eventLog.raw.data | json }}</pre>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-      </div>
+  <div class="card card-block" style="max-width: 100%">
+    <div>
+      <center ng-show="busy"><h2><i class="fa fa-circle-notch fa-spin"></i></h2></center>
+      <table ng-hide="busy" class="table table-condensed table-hover">
+        <thead>
+          <tr>
+            <th class="col-md-2">{{ 'eventlog.time' | tr }}</th>
+            <th class="col-md-2">{{ 'eventlog.source' | tr }}</th>
+            <th class="col-md-8">{{ 'eventlog.details' | tr }}</th>
+          </tr>
+        </thead>
+        <tbody ng-repeat="eventLog in eventLogs">
+          <tr ng-click="showEventLogDetails(eventLog)" class="hand">
+            <td><span uib-tooltip="{{ eventLog.raw.creationTime | prettyLongDate }}" class="arrow">{{ eventLog.raw.creationTime | prettyDate }}</span></td>
+            <td>{{ eventLog.source }}</td>
+            <td ng-bind-html="eventLog.details"></td>
+          </tr>
+          <tr ng-show="activeEventLog === eventLog">
+            <td colspan="4">
+              <p ng-show="eventLog.raw.source.ip">Source IP: <code>{{ eventLog.raw.source.ip }}</code></p>
+              <pre class="eventlog-details">{{ eventLog.raw.data | json }}</pre>
+            </td>
+          </tr>
+        </tbody>
+      </table>
     </div>
   </div>
 </div>
diff --git a/dashboard/public/views/system.html b/dashboard/public/views/system.html
index 4bc8902c7..304af2d64 100644
--- a/dashboard/public/views/system.html
+++ b/dashboard/public/views/system.html
@@ -1,4 +1,4 @@
-<div class="container">
+<div>
 
   <h1 class="section-header">
     {{ 'system.title' | tr }}
diff --git a/dashboard/src/theme.scss b/dashboard/src/theme.scss
index 3dbbf8b1a..b3f16311a 100644
--- a/dashboard/src/theme.scss
+++ b/dashboard/src/theme.scss
@@ -1146,7 +1146,6 @@ multiselect {
     flex-wrap: wrap;
     gap: 5px;
     margin: auto;
-    max-width: 1400px;
     padding: 15px 10px;
     background: transparent;
 }
@@ -1154,8 +1153,6 @@ multiselect {
 .appstore-grid {
     margin: auto;
     overflow: auto;
-    height: calc(100% - 65px); // offset navigation bar
-    max-width: 1400px;
 
     h2 {
         font-size: 20px;