diff --git a/CHANGELOG b/CHANGELOG
index 05566f36338e17655174827d8fca77b5f19e2eb2..979c9e6e30d5d63ef008b4682cced53ffd22fd33 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -17,6 +17,7 @@ v 8.10.0 (unreleased)
   - Remove unused front-end variable -> default_issues_tracker
   - Add API endpoint for a group issues !4520 (mahcsig)
   - Allow [ci skip] to be in any case and allow [skip ci]. !4785 (simon_w)
+  - Add basic system information like memory and disk usage to the admin panel
 
 v 8.9.3 (unreleased)
   - Decreased min width of screen to 1280px for pinned sidebar
diff --git a/app/views/admin/background_jobs/_head.html.haml b/app/views/admin/background_jobs/_head.html.haml
index 5ad99a7f6e0894f7143ba2acfb32ec0aabc6175c..9d722bd7382ae560b12a9bb306420b7b35b04e3a 100644
--- a/app/views/admin/background_jobs/_head.html.haml
+++ b/app/views/admin/background_jobs/_head.html.haml
@@ -1,9 +1,9 @@
 .nav-links.sub-nav
   %ul{ class: (container_class) }
-  = nav_link(controller: :system_info) do
-    = link_to admin_system_info_path, title: 'System Info' do
-      %span
-        System Info
+    = nav_link(controller: :system_info) do
+      = link_to admin_system_info_path, title: 'System Info' do
+        %span
+          System Info
     = nav_link(controller: :background_jobs) do
       = link_to admin_background_jobs_path, title: 'Background Jobs' do
         %span
diff --git a/app/views/admin/system_info/show.html.haml b/app/views/admin/system_info/show.html.haml
index 01496e4fcf50aaf8c8b550c180e56bf900dfec4b..2a1fac6e48b76819063a3d5806e46dcae712a389 100644
--- a/app/views/admin/system_info/show.html.haml
+++ b/app/views/admin/system_info/show.html.haml
@@ -3,7 +3,7 @@
 = render 'admin/background_jobs/head'
 
 %div{ class: (container_class) }
-  %p
+  .prepend-top-default
   .row
     .col-sm-4
       .light-well