diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index a32a09bf..ad9a970b 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -13,6 +13,9 @@
     <j:useBean var="navbean" class="org.apache.maven.NavBean"/>
 	<j:set var="location" value="${outFile.substring(destdir.length())}"/>
 	<util:replace var="location" oldChar="\" newChar="/" value="${location}"/>
+
+    <!-- Stores location for publish date / version -->
+    <j:set var="date">${maven.xdoc.date}</j:set>
       
 	<j:setProperties 
 		object="${navbean}"
@@ -107,8 +110,6 @@
         <div id="breadcrumbs">
           <table border="0" cellspacing="0" cellpadding="4" width="100%">
             <tr>
-              <!-- date of publish and version -->
-              <j:set var="date">${maven.xdoc.date}</j:set>
               <j:if test="${date == 'left'}">
                 <j:set var="version" value="${maven.xdoc.version}"/>
                 <td>Last published: ${build.date}
@@ -138,9 +139,9 @@
           <tr valign="top">
             <td id="leftcol" width="20%">
               <div id="navcolumn">
-                <j:if test="${context.findVariable('maven.xdoc.date') == 'navigation-top'}">
+                <j:if test="${date == 'navigation-top'}">
                   <div>
-                    <small>Last published: ${buildDate}</small>
+                    <small>Last published: ${build.date}</small>
                   </div>
                 </j:if>
 
@@ -284,7 +285,7 @@
                   </j:if>
                 </div>
               </j:if>
-                <j:if test="${context.findVariable('maven.xdoc.date') == 'navigation-bottom'}">
+                <j:if test="${date == 'navigation-bottom'}">
                   <div>
                     <small>Last published: ${build.date}</small>
                   </div>
@@ -308,7 +309,7 @@
           </tr>
         </table>
         <div id="footer">
-          <table border="0" cellspacing="0" cellpadding="4">
+          <table style='width:100%' border="0" cellspacing="0" cellpadding="4">
             <jsl:applyTemplates select="$nav/body/footer"/>
             <tr>
               <td>
@@ -326,12 +327,12 @@
                   </j:if>
                 </j:if>
 
-                <j:if test="${context.findVariable('maven.xdoc.date') == 'bottom'}">
+                <j:if test="${date == 'bottom'}">
                   - Last published: ${build.date}
                 </j:if>
               </td>
-              <j:if test="${context.findVariable('maven.xdoc.date') == 'bottom-right'}">
-                <td align="right">Last published: ${build.date}</td>
+              <j:if test="${date == 'bottom-right'}">
+                <td style='width: auto; text-align:right'>Last published: ${build.date}</td>
               </j:if>
             </tr>
           </table>