diff --git a/app/Console/Commands/DemoSeederCommand.php b/app/Console/Commands/DemoSeederCommand.php
index cf7a9f01..07edad2f 100644
--- a/app/Console/Commands/DemoSeederCommand.php
+++ b/app/Console/Commands/DemoSeederCommand.php
@@ -265,38 +265,33 @@ class DemoSeederCommand extends Command
             [
                 'name'  => 'app_name',
                 'value' => 'Cachet Demo',
-            ],
-            [
+            ], [
                 'name'  => 'app_domain',
                 'value' => 'https://demo.cachethq.io',
-            ],
-            [
+            ], [
                 'name'  => 'show_support',
                 'value' => '1',
-            ],
-            [
+            ], [
                 'name'  => 'app_locale',
                 'value' => 'en',
-            ],
-            [
+            ], [
                 'name'  => 'app_timezone',
                 'value' => 'Europe/London',
-            ],
-            [
+            ], [
                 'name'  => 'app_incident_days',
                 'value' => '7',
-            ],
-            [
+            ], [
                 'name'  => 'app_analytics',
                 'value' => 'UA-58442674-3',
-            ],
-            [
+            ], [
                 'name'  => 'app_analytics_gs',
                 'value' => 'GSN-712462-P',
-            ],
-            [
+            ], [
                 'name'  => 'display_graphs',
                 'value' => '1',
+            ], [
+                'name'  => 'app_about',
+                'value' => 'This is the demo instance of [Cachet](https://cachethq.io?ref=demo). The open source status page system, for everyone. An [Alt Three](https://alt-three.com) product.',
             ],
         ];
 
diff --git a/resources/assets/sass/_status-page.scss b/resources/assets/sass/_status-page.scss
index 14422fc2..05bf59ed 100755
--- a/resources/assets/sass/_status-page.scss
+++ b/resources/assets/sass/_status-page.scss
@@ -296,7 +296,14 @@ body.status-page {
         &.components {
             @extend .panel;
             border-color: $cachet_gray_light;
-            margin-bottom: 30px;
+
+            &:last-child {
+                margin-bottom: 30px;
+            }
+
+            + .components {
+                margin-top: 5px;
+            }
 
             p {
                 margin-bottom: 10px;
diff --git a/resources/lang/en/cachet.php b/resources/lang/en/cachet.php
index 2f3a780b..0062c451 100755
--- a/resources/lang/en/cachet.php
+++ b/resources/lang/en/cachet.php
@@ -12,6 +12,9 @@
 return [
     // Components
     'components' => [
+        'group' => [
+            'other' => 'Other Components',
+        ],
         'status' => [
             1 => 'Operational',
             2 => 'Performance Issues',
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index c89d242a..682b4f44 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -5,12 +5,12 @@
     @include('dashboard.partials.errors')
 </div>
 
-@include('partials.about-app')
-
 <div class="section-status">
     <div class="alert alert-{{ $system_status }}">{{ $system_message }}</div>
 </div>
 
+@include('partials.about-app')
+
 @if(!$component_groups->isEmpty() || !$ungrouped_components->isEmpty())
 <div class="section-components">
     @include('partials.components')
diff --git a/resources/views/partials/about-app.blade.php b/resources/views/partials/about-app.blade.php
index 196635d0..ca857340 100644
--- a/resources/views/partials/about-app.blade.php
+++ b/resources/views/partials/about-app.blade.php
@@ -1,7 +1,7 @@
 @if($about_app)
 <div class="about-app">
-    <h1>{{ trans('cachet.about_this_site') }}</h1>
-    <p>{!! $about_app !!}</p>
+    <h2>{{ trans('cachet.about_this_site') }}</h2>
+    {!! $about_app !!}
 </div>
 @endif
 
diff --git a/resources/views/partials/components.blade.php b/resources/views/partials/components.blade.php
index 78ed2635..e4e95170 100644
--- a/resources/views/partials/components.blade.php
+++ b/resources/views/partials/components.blade.php
@@ -1,6 +1,6 @@
+@if($component_groups->count() > 0)
+@foreach($component_groups as $componentGroup)
 <ul class="list-group components">
-    @if($component_groups->count() > 0)
-    @foreach($component_groups as $componentGroup)
     @if($componentGroup->enabled_components->count() > 0)
     <li class="list-group-item group-name">
         <i class="{{ $componentGroup->collapse_class }} group-toggle"></i>
@@ -17,15 +17,17 @@
     @endforeach
     </div>
     @endif
-    @endforeach
-    @if($ungrouped_components->count() > 0)
-    <li class="list-group-item break"></li>
-    @endif
-    @endif
+</ul>
+@endforeach
+@endif
 
-    @if($ungrouped_components->count() > 0)
+@if($ungrouped_components->count() > 0)
+<ul class="list-group components">
+    <li class="list-group-item group-name">
+        <strong>{{ trans('cachet.components.group.other') }}</strong>
+    </li>
     @foreach($ungrouped_components as $component)
     @include('partials.component', compact($component))
     @endforeach
-    @endif
 </ul>
+@endif