diff --git a/resources/assets/sass/_status-page.scss b/resources/assets/sass/_status-page.scss
index 14422fc2..e58a4434 100755
--- a/resources/assets/sass/_status-page.scss
+++ b/resources/assets/sass/_status-page.scss
@@ -83,6 +83,10 @@ body.status-page {
         font-weight: 600;
     }
 
+    h4 + .timeline {
+        margin-bottom: 10px;
+    }
+
     .timeline {
         .content-wrapper {
             margin-top: 40px;
@@ -296,7 +300,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/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