diff --git a/app/helpers/breweries_helper.rb b/app/helpers/breweries_helper.rb
index 34a9fdd..2e591a5 100644
--- a/app/helpers/breweries_helper.rb
+++ b/app/helpers/breweries_helper.rb
@@ -5,7 +5,7 @@ module BreweriesHelper
   end
   
   def show_brewery_link(brewery)
-    link_to 'Show', brewery_path(brewery.page.title_for_url),
+    link_to brewery.title, brewery_path(brewery.page.title_for_url),
       { :title => brewery.title }
   end
   
diff --git a/app/views/breweries/index.rhtml b/app/views/breweries/index.rhtml
index edffbae..424c9e5 100644
--- a/app/views/breweries/index.rhtml
+++ b/app/views/breweries/index.rhtml
@@ -1,23 +1,12 @@
+<ul>
 <% unless @breweries.empty? -%>
-<table>
-  <tr>
-    <th>Title</th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-<% for brewery in @breweries %>
-  <tr>
-    <td><%= brewery.title -%></td>
-    <td><%= link_to 'Show', brewery_path(brewery.page.title_for_url) %></td>
-    <td><%= link_to 'Edit', edit_brewery_path(brewery.page.title_for_url) %></td>
-    <td><%= link_to 'Destroy', brewery_path(brewery.page.title_for_url), :confirm => 'Are you sure?', :method => :delete %></td>
-  </tr>
-<% end %>
-</table>
+<% for brewery in @breweries %><li><%= show_brewery_link(brewery) -%></li><% end -%>
 <% else -%>
-<p>No breweries, yet.</p>
+<li>No breweries, yet.</li>
 <% end -%>
+</ul>
+
+<%= render :partial => 'shared/pagination_links' %>
 
 <% content_for :sidebar do -%>
   <%= link_to 'New brewery', new_brewery_path -%><br />
diff --git a/app/views/breweries/show.rhtml b/app/views/breweries/show.rhtml
index 974146a..872515a 100644
--- a/app/views/breweries/show.rhtml
+++ b/app/views/breweries/show.rhtml
@@ -1,6 +1,7 @@
 <%= render :partial => 'pages/page' %>
 
 <% content_for :sidebar do -%>
-  <%= link_to 'New Brewery', new_brewery_path -%><br />
-  <%= link_to 'Edit', edit_brewery_path(@brewery.page.title_for_url) -%><br />
+  <%= new_brewery_link -%><br />
+  <%= edit_brewery_link(@brewery) -%><br />
+  <%= link_to 'Destroy', brewery_path(@brewery.page.title_for_url), :confirm => 'Are you sure?', :method => :delete %><br />
 <% end -%>