diff --git a/dada/DADA/MailingList/Archives.pm b/dada/DADA/MailingList/Archives.pm
index 1a0f50812..367d37102 100755
--- a/dada/DADA/MailingList/Archives.pm
+++ b/dada/DADA/MailingList/Archives.pm
@@ -619,11 +619,19 @@ sub make_nav_table {
     }
 
     my ( $prev, $next );
-
     ( $prev, $next ) = $self->get_neighbors($id);
 
-    my $prev_subject = $self->get_archive_subject($prev);
-    my $next_subject = $self->get_archive_subject($next);
+    my $prev_subject;
+    my $next_subject;
+
+    if ($prev) {
+        $prev_subject = $self->_parse_in_list_info(
+            -data => $self->get_archive_subject($prev) );
+    }
+    if ($next) {
+        $next_subject = $self->_parse_in_list_info(
+            -data => $self->get_archive_subject($next) );
+    }
 
     require DADA::Template::Widgets;
     return DADA::Template::Widgets::screen(
@@ -631,12 +639,10 @@ sub make_nav_table {
             -screen => 'archive_nav_table_widget.tmpl',
             -list   => $list,
             -vars   => {
-                prev => $prev,
-                next => $next,
-                prev_subject =>
-                  $self->_parse_in_list_info( -data => $prev_subject ),
-                next_subject =>
-                  $self->_parse_in_list_info( -data => $next_subject ),
+                prev         => $prev,
+                next         => $next,
+                prev_subject => $prev_subject,
+                next_subject => $next_subject,
                 flavor_label => $flavor_label,
             },
             -list_settings_vars       => $self->{ls}->params,
@@ -649,6 +655,7 @@ sub make_nav_table {
 
 
 
+
 =pod
 
 =head2 make_search_form
diff --git a/dada/DADA/Template/templates/archive_index_nav_table_widget.tmpl b/dada/DADA/Template/templates/archive_index_nav_table_widget.tmpl
index 6921272a8..cc251dd8b 100644
--- a/dada/DADA/Template/templates/archive_index_nav_table_widget.tmpl
+++ b/dada/DADA/Template/templates/archive_index_nav_table_widget.tmpl
@@ -1,7 +1,7 @@
 <!-- begin archive_index_nav_table_widget.tmpl -->
 
 
-<table cellpadding="5" width="100%"> 
+<table cellpadding="5" width="100%" style="margin-left: auto; margin-right: auto;"> 
  <tr>
   <td valign="top" align="left" width="33%">
    <p>
diff --git a/dada/DADA/Template/templates/archive_nav_table_widget.tmpl b/dada/DADA/Template/templates/archive_nav_table_widget.tmpl
index 5c1f96f5c..cb8ea5bae 100644
--- a/dada/DADA/Template/templates/archive_nav_table_widget.tmpl
+++ b/dada/DADA/Template/templates/archive_nav_table_widget.tmpl
@@ -1,6 +1,7 @@
 <!-- begin archive_nav_table_widget.tmpl --> 
 
-<table cellpadding="5"> 
+
+<table cellpadding="5" style="margin-left: auto; margin-right: auto;"> 
  <tr>
   <td valign="top" align="left" width="33%">
    <p>
diff --git a/dada/DADA/Template/templates/view_archive_screen.tmpl b/dada/DADA/Template/templates/view_archive_screen.tmpl
index 8b5973972..20a375bf8 100644
--- a/dada/DADA/Template/templates/view_archive_screen.tmpl
+++ b/dada/DADA/Template/templates/view_archive_screen.tmpl
@@ -53,11 +53,7 @@
 <!-- tmpl_include show_archive_msg_buttons_widget.tmpl --> 
 
 
-
-
-<div align="center">
 	<!-- tmpl_var nav_table --> 
-</div>