diff --git a/Gemfile.lock b/Gemfile.lock
index 66f6453..0f8d658 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,26 +41,26 @@ GEM
     execjs (1.4.0)
       multi_json (~> 1.0)
     hike (1.2.1)
-    hirb (0.7.0)
+    hirb (0.7.1)
     i18n (0.6.1)
     journey (1.0.4)
     jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
-    json (1.7.6)
+    json (1.7.7)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.5.0)
+    mime-types (1.21)
+    multi_json (1.6.1)
     pg (0.12.2)
     pg (0.12.2-x86-mingw32)
     polyglot (0.3.3)
-    rack (1.4.3)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -80,7 +80,7 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
-    rdoc (3.12)
+    rdoc (3.12.1)
       json (~> 1.4)
     sass (3.2.5)
     sass-rails (3.2.5)
@@ -94,7 +94,7 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.5)
     sqlite3 (1.3.5-x86-mingw32)
-    thor (0.16.0)
+    thor (0.17.0)
     tilt (1.3.3)
     treetop (1.4.12)
       polyglot
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index 22563b7..bf0cf80 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -1,30 +1,38 @@
-<p id="notice"><%= notice %></p>
+<% if notice %>
+	<div id="notice" class="alert alert-success"><%= notice %></div>
+<% end %>
 
-<p>
-  <b>Event Name:</b>
-  <%= @event.name %>
-</p>
+<h1 id="eventName"><%= @event.name %></h1>
+<dd><em><%= @event.description %></em></dd>
+<br/><br/>
 
 <p><u>Drivers </u></p>
 <% @drivers.each do |driver| %>
 	<em><%= driver.name %></em><br/>
+	<% @riders.each do |rider|
+		#
+		# Temporary solution, want to optimize later
+		#
+		if rider.driver_id == driver.id %>
+		<em><%= rider.name %></em><br/>
+	<% 	end
+	end %>
 <% end %>
 
 <% if @drivers.empty? %>
 	<em>Currently no drivers...</em><br/>
 <% end %>
 <br />
-<p><u>Rider </u></p>
-<% @riders.each do |rider| %>
-	<em><%= rider.name %></em><br/>
-<% end %>
-
-<% if @riders.empty? %>
-	<em>Currently no riders...</em><br/>
-<% end %>
-
 
 <br/>
 <br />
 <%= link_to 'Edit', edit_event_path(@event) %> |
 <%= link_to 'Back', events_path %>
+
+<% if notice %>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			$('#notice').delay(2000).fadeOut('slow');
+		})
+	</script>
+<% end %>
\ No newline at end of file