diff --git a/templates/book/author.html.ep b/templates/book/author.html.ep
index 93aa1c3..ee62f2e 100644
--- a/templates/book/author.html.ep
+++ b/templates/book/author.html.ep
@@ -1,5 +1,7 @@
 % layout 'default';
 % title 'Author: ' . $author->name;
-<h1>Author: <%= $author->name %></h1>
+<h1><%= title %></h1>
 
-<strong><%= $author->name %></strong> wrote <%= $author->books->count %> books.
+<strong><%= $author->name %></strong>
+% my $count = $author->books->count;
+wrote <%= $count %> book<%= "s" if ($count > 1) %>.
diff --git a/templates/book/authors.html.ep b/templates/book/authors.html.ep
index f3025e7..bf5b564 100644
--- a/templates/book/authors.html.ep
+++ b/templates/book/authors.html.ep
@@ -1,6 +1,6 @@
 % layout 'default';
 % title 'Authors';
-<h1>Author page</h1>
+<h1>Authors</h1>
 
 <%# On a new search, reset the page number to 1. %>
 %= form_for authors => { page_number => 1 } => begin
@@ -16,11 +16,13 @@
 <div>
   <table>
     <tr>
-      <th>Name</th>
+      <th>Books</th>
+      <th>Authored by</th>
     </tr>
 % for my $author ($author_page->all) {
     <tr>
-      <td><%= link_to($author->name => 'author' => { id => $author->id}) %></td>
+      <td style="text-align:right"><%= $author->books->count %></td>
+      <td style="padding-left:1em"><%= link_to($author->name => 'author' => { id => $author->id}) %></td>
     </tr>
 % }
   </table>
diff --git a/templates/book/books.html.ep b/templates/book/books.html.ep
index 51bec75..2df30a6 100644
--- a/templates/book/books.html.ep
+++ b/templates/book/books.html.ep
@@ -1,6 +1,6 @@
 % layout 'default';
 % title 'Books';
-<h1>Book page</h1>
+<h1>Books</h1>
 
 <%# On a new search, reset the page number to 1. %>
 %= form_for books => { page_number => 1 } => begin
@@ -21,7 +21,9 @@
 % for my $book ($book_page->all) {
     <tr>
       <td><%= $book->title %></td>
-      <td><%= $book->author->name %></td>
+      <td>
+        <%= link_to($book->author->name => 'author' => { id => $book->author->id}) %>
+      </td>
     </tr>
 % }
   </table>