diff --git a/app/Composers/ComponentsComposer.php b/app/Composers/ComponentsComposer.php
index 7e62715c..1fac9423 100644
--- a/app/Composers/ComponentsComposer.php
+++ b/app/Composers/ComponentsComposer.php
@@ -53,7 +53,7 @@ class ComponentsComposer
     public function compose(View $view)
     {
         $componentGroups = $this->getVisibleGroupedComponents();
-        $ungroupedComponents = Component::ungrouped()->get();
+        $ungroupedComponents = Component::ungrouped()->orderBy('status', 'desc')->get();
 
         $view->withComponentGroups($componentGroups)
             ->withUngroupedComponents($ungroupedComponents);
diff --git a/app/Presenters/IncidentPresenter.php b/app/Presenters/IncidentPresenter.php
index 139860cb..0a8e8a65 100644
--- a/app/Presenters/IncidentPresenter.php
+++ b/app/Presenters/IncidentPresenter.php
@@ -256,7 +256,7 @@ class IncidentPresenter extends BasePresenter implements Arrayable
     public function latest()
     {
         if (is_bool($this->latest)) {
-            $this->latest = $this->wrappedObject->updates()->orderBy('created_at', 'desc')->first();
+            $this->latest = $this->wrappedObject->updates()->first();
         }
 
         return $this->latest;
diff --git a/resources/views/partials/components.blade.php b/resources/views/partials/components.blade.php
index 2fd869af..c35143a9 100644
--- a/resources/views/partials/components.blade.php
+++ b/resources/views/partials/components.blade.php
@@ -12,7 +12,7 @@
     </li>
 
     <div class="group-items {{ $componentGroup->is_collapsed ? "hide" : null }}">
-        @each('partials.component', $componentGroup->enabled_components()->orderBy('order')->get(), 'component')
+        @each('partials.component', $componentGroup->enabled_components, 'component')
     </div>
     @endif
 </ul>
@@ -25,7 +25,7 @@
         <strong>{{ trans('cachet.components.group.other') }}</strong>
 
         <div class="pull-right">
-            <i class="ion ion-ios-circle-filled text-component-{{ $ungroupedComponents->max('status') }} {{ $ungroupedComponents->sortByDesc('status')->first()->status_color }}" data-toggle="tooltip" title="{{ $ungroupedComponents->sortByDesc('status')->first()->human_status }}"></i>
+            <i class="ion ion-ios-circle-filled text-component-{{ $ungroupedComponents->max('status') }} {{ $ungroupedComponents->first()->status_color }}" data-toggle="tooltip" title="{{ $ungroupedComponents->first()->human_status }}"></i>
         </div>
     </li>