diff --git a/app/controllers/HomeController.php b/app/controllers/HomeController.php
index b09daa15..f325c063 100644
--- a/app/controllers/HomeController.php
+++ b/app/controllers/HomeController.php
@@ -6,6 +6,6 @@
 		 * @return View
 		 */
 		public function showIndex() {
-			return View::make('index');
+			return View::make('index', ['components' => Component::all()]);
 		}
 	}
diff --git a/app/views/index.blade.php b/app/views/index.blade.php
index 0e12f0ac..51ff5655 100644
--- a/app/views/index.blade.php
+++ b/app/views/index.blade.php
@@ -7,9 +7,10 @@
 	<p>You're logged in. This will be a link to the Dashboard.</p>
 	@endif
 
+	@if($components->count() > 0)
 	<div class='page-header'>
 		<ul class='list-group components'>
-			@foreach(Component::get() as $component)
+			@foreach($components as $component)
 			<li class='list-group-item component '>
 				<h4>{{ $component->name }} <small class='{{ $component->color }}'>{{ $component->humanStatus }}</small></h4>
 				<p>{{ $component->description }}</p>
@@ -17,6 +18,7 @@
 			@endforeach
 		</ul>
 	</div>
+	@endif
 
 	@for($i=0; $i <= 7; $i++)
 	@include('incident', array('i', $i))