diff --git a/app/views/attendance_entries/edit.html.erb b/app/views/attendance_entries/edit.html.erb
index 8073218b..0714ba4f 100644
--- a/app/views/attendance_entries/edit.html.erb
+++ b/app/views/attendance_entries/edit.html.erb
@@ -4,7 +4,7 @@
   <li><%= link_to @attendance_entry.name, attendance_entry_path(@attendance_entry) %></li>
   <li>Edit</li>
 </ol>
-<h1>An Attendance Entry for <%= @attendance_entry.event.title %></h1>
+<h1><%= @attendance_entry.name %> <small>Edit</small></h1>
 
 <%= render 'form' %>
 
diff --git a/app/views/attendance_entries/index.html.erb b/app/views/attendance_entries/index.html.erb
index 6872eeba..81fe0167 100644
--- a/app/views/attendance_entries/index.html.erb
+++ b/app/views/attendance_entries/index.html.erb
@@ -3,7 +3,7 @@
   <li><%= @event.title %></li>
 </ol>
 
-<h1>Attendance List for <%= @event.title %></h1>
+<h1><%= @event.title %> <small>Attendance List</small></h1>
 
 <p>
   This table shows only the most useful Yale Phonebook (LDAP) attributes - you can see more details in two ways:
diff --git a/app/views/attendance_entries/new.html.erb b/app/views/attendance_entries/new.html.erb
index 80aa02cd..7e3da293 100644
--- a/app/views/attendance_entries/new.html.erb
+++ b/app/views/attendance_entries/new.html.erb
@@ -3,7 +3,7 @@
   <li><%= link_to @event.title, event_attendance_entries_path(@event) %></li>
   <li>New Entry</li>
 </ol>
-<h1>An Attendance Entry for <%= @event.title %></h1>
+<h1><%= @event.title %> <small>New Attendance Entry</small></h1>
 
 <%= render 'form' %>
 
diff --git a/app/views/attendance_entries/show.html.erb b/app/views/attendance_entries/show.html.erb
index 118836b2..4589d9e1 100644
--- a/app/views/attendance_entries/show.html.erb
+++ b/app/views/attendance_entries/show.html.erb
@@ -3,6 +3,9 @@
   <li><%= link_to @attendance_entry.event.title, event_attendance_entries_path(@attendance_entry.event) %></li>
   <li><%= @attendance_entry.name %></li>
 </ol>
+
+<h1><%= @attendance_entry.name %> <small>Details</small></h1>
+
 <p id="notice"><%= notice %></p>
 
 <p>
diff --git a/app/views/events/edit.html.erb b/app/views/events/edit.html.erb
index 9759435c..77b33718 100644
--- a/app/views/events/edit.html.erb
+++ b/app/views/events/edit.html.erb
@@ -3,9 +3,6 @@
   <li><%= link_to @event.title, event_path(@event) %></li>
   <li>Edit</li>
 </ol>
-<h1>Editing event</h1>
+<h1><%= @event.title %> <small>Edit</small></h1>
 
-<%= render 'form' %>
-
-<%= link_to 'Show', @event %> |
-<%= link_to 'Back', events_path %>
+<%= render 'form' %>
\ No newline at end of file
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index d7a686f3..2a9e81c9 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -14,6 +14,7 @@
   <table class="table table-striped">
     <thead>
       <tr>
+        <th></th>
         <th></th>
         <th></th>
         <th>Title</th>
@@ -21,7 +22,6 @@
         <th>Count</th>
         <th>Last Swipe-In</th>
         <th></th>
-        <th></th>
       </tr>
     </thead>
 
@@ -38,11 +38,11 @@
               <span class="glyphicon glyphicon-list-alt"></span> Attendance
             <% end %>
           </td>
+          <td><%= link_to 'Edit Event', edit_event_path(event), :class => "btn btn-default" %></td>
           <td><%= event.title %></td>
           <td><%= event.description %></td>
           <td><%= event.attendance_entries.count %></td>
           <td><%= event.last_edited %></td>
-          <td><%= link_to 'Edit', edit_event_path(event), :class => "btn btn-default" %></td>
           <td><%= link_to 'Destroy', event, method: :delete, data: { confirm: 'Are you sure?' }, :class => "btn btn-danger" %></td>
         </tr>
       <% end %>
diff --git a/app/views/events/new.html.erb b/app/views/events/new.html.erb
index 6119978e..989f8f54 100644
--- a/app/views/events/new.html.erb
+++ b/app/views/events/new.html.erb
@@ -1,5 +1,7 @@
+<ol class="breadcrumb">
+  <li><%= link_to "Events", events_path %></li>
+  <li>New</li>
+</ol>
 <h1>New event</h1>
 
-<%= render 'form' %>
-
-<%= link_to 'Back', events_path %>
+<%= render 'form' %>
\ No newline at end of file
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
deleted file mode 100644
index 22f76e2d..00000000
--- a/app/views/events/show.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <strong>Title:</strong>
-  <%= @event.title %>
-</p>
-
-<p>
-  <strong>Description:</strong>
-  <%= @event.description %>
-</p>
-
-<%= link_to 'Edit', edit_event_path(@event) %> |
-<%= link_to 'Back', events_path %>
diff --git a/app/views/events/show.json.jbuilder b/app/views/events/show.json.jbuilder
deleted file mode 100644
index bd101bdf..00000000
--- a/app/views/events/show.json.jbuilder
+++ /dev/null
@@ -1 +0,0 @@
-json.extract! @event, :title, :description, :created_at, :updated_at