diff --git a/public/default.css b/public/default.css
index ae97d98..d4d4a4a 100644
--- a/public/default.css
+++ b/public/default.css
@@ -26,7 +26,7 @@ div.page-nav {
 }
 
 div.page-nav > span {
-    padding-right: 1em;
+    padding-right: 2em;
 }
 
 div.verbiage {
diff --git a/templates/_page-navigation.html.ep b/templates/_page-navigation.html.ep
index c848c9d..71ba000 100644
--- a/templates/_page-navigation.html.ep
+++ b/templates/_page-navigation.html.ep
@@ -2,24 +2,23 @@
 
 % if ($pager->total_entries > rpp) {
   <span>
-  <%= link_to url_with(page_number => 1) => begin %>◄ First<% end %>
 
 % if (my $prev = $pager->previous_page) {
-   <%= link_to url_with(page_number => $prev) => begin %>◄ Prev<% end %>
+   <%= link_to url_with(page_number => 1) => begin %>« First<% end %>
+   &nbsp;<%= link_to url_with(page_number => $prev) => begin %>◄ Prev<% end %>
 % } else {
-◄ Prev
+« First &nbsp;◄ Prev
 % }
 
 % if (my $next = $pager->next_page) {
-   <%= link_to url_with(page_number => $next) => begin %>Next ►<% end %>
+   &nbsp;<%= link_to url_with(page_number => $next) => begin %>Next ►<% end %>
+   &nbsp;<%= link_to url_with(page_number => $pager->last_page) => begin %>Last »<% end %>
 % } else {
-Next ►
+ &nbsp;Next ► &nbsp;Last »
 % }
 
-<%= link_to url_with(page_number => $pager->last_page) => begin %>Last ►<% end %>
 % }
   </span>
-% }
 
   <span>
 <%= $pager->entries_on_this_page %> <%= $items_name || "items" %>
@@ -31,5 +30,6 @@ of
 on page <%= commify($pager->current_page) %>
 of <%= commify($pager->last_page) %>.
   </span>
+% }
 
 </div>