diff --git a/app/start/global.php b/app/start/global.php
index 82ab9ba4..6c3c8cb5 100644
--- a/app/start/global.php
+++ b/app/start/global.php
@@ -79,3 +79,5 @@ App::down(function()
 */
 
 require app_path().'/filters.php';
+
+require app_path().'/view-composers.php';
diff --git a/app/views/incident.blade.php b/app/views/incident.blade.php
index 319e778a..08602881 100644
--- a/app/views/incident.blade.php
+++ b/app/views/incident.blade.php
@@ -1,15 +1,15 @@
 <?php
 	$incidentDate = Carbon::now()->subDays($i);
-	$incidents = Incident::whereRaw('DATE(created_at) = "' . $incidentDate->format('Y-m-d') . '"')->get();
+	$incidents = Incident::whereRaw('DATE(created_at) = "' . $incidentDate->format('Y-m-d') . '"')->orderBy('created_at', 'desc')->get();
 ?>
-<li>
+<li class='list-group-item'>
 	<h1>{{ $incidentDate->format('jS M, Y') }}</h1>
-	<ul>
+	<ul class='list-group'>
 	@if($incidents->count() === 0)
-	<li>No incidents reported.</li>
+	<li class='list-group-item'>No incidents reported.</li>
 	@else
 	@foreach($incidents as $incident)
-	<li>
+	<li class='list-group-item'>
 		<h2>{{ $incident->name }}, <small>{{ $incident->humanStatus }}</small></h2>
 		<h3><time>{{ $incident->created_at->format('H:i:s A') }}</time></h3>
 		<p>{{ $incident->message }}</p>
diff --git a/app/views/index.blade.php b/app/views/index.blade.php
index 7611615a..88b5913e 100644
--- a/app/views/index.blade.php
+++ b/app/views/index.blade.php
@@ -1,25 +1,31 @@
 @extends('layout.master')
 
 @section('content')
-	<ul>
-		@foreach(Component::get() as $component)
-		<li>
-			{{ $component->name }}
-			@if($component->description)
-			<small>{{ $component->description }}</small>
-			@endif
+	<div class='row'>
+		<div class='alert alert-{{ $systemStatus }}'>{{ $systemMessage }}</div>
+	</div>
 
-			<span class='pull-right'>
-				{{ $component->humanStatus }}
-			</span>
-		</li>
-		@endforeach
-	</ul>
+	<div class='row'>
+		<ul class='list-group'>
+			@foreach(Component::get() as $component)
+			<li class='list-group-item'>
+				{{ $component->name }}
+				@if($component->description)
+				<small>{{ $component->description }}</small>
+				@endif
 
-	<h1>Past Incidents</h1>
-	<ul>
-	@for($i=0; $i <= 7; $i++)
-		@include('incident', array('i', $i))
-	@endfor
-	</ul>
+				<span class='pull-right'>{{ $component->humanStatus }}</span>
+			</li>
+			@endforeach
+		</ul>
+	</div>
+
+	<div class='row'>
+		<h1>Past Incidents</h1>
+		<ul class='list-group'>
+		@for($i=0; $i <= 7; $i++)
+			@include('incident', array('i', $i))
+		@endfor
+		</ul>
+	</div>
 @stop