diff --git a/source/web/jsp/admin/admin-console.jsp b/source/web/jsp/admin/admin-console.jsp
index 144fb9216e..a17ca58c6e 100644
--- a/source/web/jsp/admin/admin-console.jsp
+++ b/source/web/jsp/admin/admin-console.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width=32>
                               <h:graphicImage id="logo" url="/images/icons/admin_console_large.gif" width="32" height="32" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.admin_console}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.admin_description}" /></div>
                            </td>
diff --git a/source/web/jsp/browse/browse.jsp b/source/web/jsp/browse/browse.jsp
index 4ab048a89e..19b154ea30 100644
--- a/source/web/jsp/browse/browse.jsp
+++ b/source/web/jsp/browse/browse.jsp
@@ -141,7 +141,7 @@
                                        </a:actionLink>
                                     </r:permissionEvaluator>
                                     <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Write" id="eval7">
-                                       <a:actionLink value="#{msg.manage_rules}" image="/images/icons/rule.gif" action="manageRules" actionListener="#{BrowseBean.setupSpaceAction}" id="link10">
+                                       <a:actionLink value="#{msg.manage_rules}" image="/images/icons/rule.gif" action="dialog:manageRules" actionListener="#{BrowseBean.setupSpaceAction}" id="link10">
                                           <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param5" />
                                        </a:actionLink>
                                     </r:permissionEvaluator>
diff --git a/source/web/jsp/categories/edit-category.jsp b/source/web/jsp/categories/edit-category.jsp
index 2698e52182..201d196378 100644
--- a/source/web/jsp/categories/edit-category.jsp
+++ b/source/web/jsp/categories/edit-category.jsp
@@ -88,13 +88,12 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="logo" url="/images/icons/edit_category_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{CategoriesBean.actionCategory.name}" /></div>
-                              <div class="mainTitle"><h:outputText value="#{msg.edit_category}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.edit_category}" /> '<h:outputText value="#{CategoriesBean.actionCategory.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.edit_category_description}" /></div>
                            </td>
                         </tr>
diff --git a/source/web/jsp/categories/new-category.jsp b/source/web/jsp/categories/new-category.jsp
index 6d765a5307..d6e5891030 100644
--- a/source/web/jsp/categories/new-category.jsp
+++ b/source/web/jsp/categories/new-category.jsp
@@ -88,12 +88,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="logo" url="/images/icons/create_category_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{CategoriesBean.currentCategory.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.new_category}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.new_category_description}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/about.jsp b/source/web/jsp/dialog/about.jsp
index 579bef0eb4..41c4929316 100644
--- a/source/web/jsp/dialog/about.jsp
+++ b/source/web/jsp/dialog/about.jsp
@@ -65,12 +65,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width=32>
                               <h:graphicImage id="logo" url="/images/logo/AlfrescoLogo32.gif" width="32" height="32" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.title_about}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.version}" />: <h:outputText value='#{version["version.edition"]} - v#{version["version.major"]}.#{version["version.minor"]}.#{version["version.revision"]}' /> <h:outputText rendered='#{version["version.label"] != ""}' value='(#{version["version.label"]})' /></div>
                            </td>
diff --git a/source/web/jsp/dialog/apply-template.jsp b/source/web/jsp/dialog/apply-template.jsp
index 4698496deb..4e11c06c52 100644
--- a/source/web/jsp/dialog/apply-template.jsp
+++ b/source/web/jsp/dialog/apply-template.jsp
@@ -64,13 +64,12 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage url="/images/icons/preview_large.gif"/>
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{SpaceDetailsBean.name}" /></div>
-                              <div class="mainTitle"><h:outputText value="#{msg.apply_dashboard}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.apply_dashboard}" /> '<h:outputText value="#{SpaceDetailsBean.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.apply_dashboard_info}" /></div>
                            </td>
                         </tr>
diff --git a/source/web/jsp/dialog/edit-search.jsp b/source/web/jsp/dialog/edit-search.jsp
index d75ff85684..7063b3801f 100644
--- a/source/web/jsp/dialog/edit-search.jsp
+++ b/source/web/jsp/dialog/edit-search.jsp
@@ -88,7 +88,7 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/save_search_large.gif" />
                            </td>
diff --git a/source/web/jsp/dialog/edit-space.jsp b/source/web/jsp/dialog/edit-space.jsp
index ab935bf3b7..4971ed4cfb 100644
--- a/source/web/jsp/dialog/edit-space.jsp
+++ b/source/web/jsp/dialog/edit-space.jsp
@@ -78,12 +78,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/create_space_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{BrowseBean.actionSpace.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.modify_props_of}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.editspace_description}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/new-space.jsp b/source/web/jsp/dialog/new-space.jsp
index 14a3468385..39a0841f17 100644
--- a/source/web/jsp/dialog/new-space.jsp
+++ b/source/web/jsp/dialog/new-space.jsp
@@ -88,12 +88,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/create_space_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{BrowseBean.actionSpace.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.new_space}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.newspace_description}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/preview-file.jsp b/source/web/jsp/dialog/preview-file.jsp
index ba351cb383..9135957eda 100644
--- a/source/web/jsp/dialog/preview-file.jsp
+++ b/source/web/jsp/dialog/preview-file.jsp
@@ -74,8 +74,8 @@
                               </div>
                               <div class="mainSubText"><h:outputText value="#{msg.previewdocument_description}" /></div>
                            </td>
-                           <td class="separator" width=1></td>
-                           <td width=100 style="padding-left:2px">
+
+                           <td align=right>
                               <%-- Available Templates --%>
                               <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.templates}" />
                               
@@ -89,12 +89,12 @@
                            
                            <%-- Navigation --%>
                            <td class="separator" width=1></td>
-                           <td width=100>
-                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.navigation}" /><br>
-                              <a:actionLink value="#{msg.next_item}" image="/images/icons/NextItem.gif" padding="4" actionListener="#{DocumentDetailsBean.nextItem}" action="nextItem">
+                           <td style="padding-left:4px" width=80>
+                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/nav_prev.gif" showLink="false" actionListener="#{DocumentDetailsBean.previousItem}" action="previousItem">
                                  <f:param name="id" value="#{DocumentPreviewBean.id}" />
                               </a:actionLink>
-                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/PreviousItem.gif" padding="4" actionListener="#{DocumentDetailsBean.previousItem}" action="previousItem">
+                              <img src="<%=request.getContextPath()%>/images/icons/nav_file.gif" width=24 height=24 align=absmiddle>
+                              <a:actionLink value="#{msg.next_item}" image="/images/icons/nav_next.gif" showLink="false" actionListener="#{DocumentDetailsBean.nextItem}" action="nextItem">
                                  <f:param name="id" value="#{DocumentPreviewBean.id}" />
                               </a:actionLink>
                            </td>
diff --git a/source/web/jsp/dialog/preview-space.jsp b/source/web/jsp/dialog/preview-space.jsp
index e4a7c0ca30..cd0ee8c162 100644
--- a/source/web/jsp/dialog/preview-space.jsp
+++ b/source/web/jsp/dialog/preview-space.jsp
@@ -74,8 +74,8 @@
                               </div>
                               <div class="mainSubText"><h:outputText value="#{msg.previewdocument_description}" /></div>
                            </td>
-                           <td class="separator" width=1></td>
-                           <td width=100 style="padding-left:2px">
+                           
+                           <td align=right>
                               <%-- Available Templates --%>
                               <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.templates}" />
                               
@@ -89,12 +89,12 @@
                            
                            <%-- Navigation --%>
                            <td class="separator" width=1></td>
-                           <td width=100>
-                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.navigation}" /><br>
-                              <a:actionLink value="#{msg.next_item}" image="/images/icons/NextItem.gif" padding="4" actionListener="#{SpaceDetailsBean.nextItem}" action="nextItem">
+                           <td style="padding-left:4px" width=80>
+                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/nav_prev.gif" showLink="false" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
                                  <f:param name="id" value="#{SpacePreviewBean.id}" />
                               </a:actionLink>
-                              <a:actionLink value="#{msg.previous_item}" image="/images/icons/PreviousItem.gif" padding="4" actionListener="#{SpaceDetailsBean.previousItem}" action="previousItem">
+                              <img src="<%=request.getContextPath()%>/images/icons/nav_space.gif" width=24 height=24 align=absmiddle>
+                              <a:actionLink value="#{msg.next_item}" image="/images/icons/nav_next.gif" showLink="false" actionListener="#{SpaceDetailsBean.nextItem}" action="nextItem">
                                  <f:param name="id" value="#{SpacePreviewBean.id}" />
                               </a:actionLink>
                            </td>
diff --git a/source/web/jsp/dialog/rules.jsp b/source/web/jsp/dialog/rules.jsp
index f94c416cfa..441a441985 100644
--- a/source/web/jsp/dialog/rules.jsp
+++ b/source/web/jsp/dialog/rules.jsp
@@ -214,7 +214,7 @@
                               <table cellpadding="1" cellspacing="1" border="0">
                                  <tr>
                                     <td align="center">
-                                       <h:commandButton value="#{msg.close}" action="browse" styleClass="wizardButton" />
+                                       <h:commandButton value="#{msg.close}" action="dialog:close" styleClass="wizardButton" />
                                     </td>
                                  </tr>
                               </table>
diff --git a/source/web/jsp/dialog/save-search.jsp b/source/web/jsp/dialog/save-search.jsp
index e5dc57b374..48436bc99c 100644
--- a/source/web/jsp/dialog/save-search.jsp
+++ b/source/web/jsp/dialog/save-search.jsp
@@ -88,7 +88,7 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/edit_search_large.gif" />
                            </td>
diff --git a/source/web/jsp/dialog/space-details.jsp b/source/web/jsp/dialog/space-details.jsp
index 146accc0bf..127d332dce 100644
--- a/source/web/jsp/dialog/space-details.jsp
+++ b/source/web/jsp/dialog/space-details.jsp
@@ -109,13 +109,18 @@
                                     <f:param name="id" value="#{SpaceDetailsBean.id}" />
                                  </a:actionLink>
                                  
-                                 <%-- Take Ownership --%>
                                  <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="TakeOwnership">
                                     <a:actionLink value="#{msg.take_ownership}" image="/images/icons/take_ownership.gif" actionListener="#{SpaceDetailsBean.takeOwnership}" id="takeOwnership" />
                                  </r:permissionEvaluator>
                                  
                                  <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="ChangePermissions">
-                                    <a:actionLink value="#{msg.manage_invited_users}" image="/images/icons/invite.gif" action="manageInvitedUsers" actionListener="#{BrowseBean.setupSpaceAction}">
+                                    <a:actionLink value="#{msg.manage_invited_users}" image="/images/icons/invite.gif" action="dialog:manageInvitedUsers" actionListener="#{BrowseBean.setupSpaceAction}">
+                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                                 
+                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Write">
+                                    <a:actionLink value="#{msg.manage_rules}" image="/images/icons/rule.gif" action="dialog:manageRules" actionListener="#{BrowseBean.setupSpaceAction}">
                                        <f:param name="id" value="#{SpaceDetailsBean.id}" />
                                     </a:actionLink>
                                  </r:permissionEvaluator>
diff --git a/source/web/jsp/dialog/system-info.jsp b/source/web/jsp/dialog/system-info.jsp
index e7c173edef..d17ca33fe1 100644
--- a/source/web/jsp/dialog/system-info.jsp
+++ b/source/web/jsp/dialog/system-info.jsp
@@ -65,7 +65,7 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                         	<td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/file_large.gif" />
                            </td>
diff --git a/source/web/jsp/forums/edit-forum.jsp b/source/web/jsp/forums/edit-forum.jsp
index 38c77ca97e..52c52db394 100644
--- a/source/web/jsp/forums/edit-forum.jsp
+++ b/source/web/jsp/forums/edit-forum.jsp
@@ -78,12 +78,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/#{BrowseBean.actionSpace.properties.icon}.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{BrowseBean.actionSpace.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.modify_props_of}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.edit_forum_description}" /></div>
                            </td>
diff --git a/source/web/jsp/forums/edit-forums.jsp b/source/web/jsp/forums/edit-forums.jsp
index e2b71863f5..7ef095630a 100644
--- a/source/web/jsp/forums/edit-forums.jsp
+++ b/source/web/jsp/forums/edit-forums.jsp
@@ -78,12 +78,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/#{BrowseBean.actionSpace.properties.icon}.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{BrowseBean.actionSpace.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.modify_props_of}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.edit_forums_description}" /></div>
                            </td>
diff --git a/source/web/jsp/forums/edit-topic.jsp b/source/web/jsp/forums/edit-topic.jsp
index 2501131bf8..78d27509e2 100644
--- a/source/web/jsp/forums/edit-topic.jsp
+++ b/source/web/jsp/forums/edit-topic.jsp
@@ -78,12 +78,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/#{BrowseBean.actionSpace.properties.icon}.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{BrowseBean.actionSpace.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.modify_props_of}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.edit_topic_description}" /></div>
                            </td>
diff --git a/source/web/jsp/roles/edit-content-user-roles.jsp b/source/web/jsp/roles/edit-content-user-roles.jsp
index 6b01e070df..2555ba29bb 100644
--- a/source/web/jsp/roles/edit-content-user-roles.jsp
+++ b/source/web/jsp/roles/edit-content-user-roles.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/edituser_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{BrowseBean.document.name}' /></div>
                               <div class="mainTitle">
                                  <h:outputText value="#{msg.modify_user_roles}" />
                                  '<h:outputText value="#{ContentUsersBean.personName}" />'
diff --git a/source/web/jsp/roles/edit-user-roles.jsp b/source/web/jsp/roles/edit-user-roles.jsp
index e21287a968..c08e794079 100644
--- a/source/web/jsp/roles/edit-user-roles.jsp
+++ b/source/web/jsp/roles/edit-user-roles.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/edituser_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{BrowseBean.actionSpace.name}' /></div>
                               <div class="mainTitle">
                                  <h:outputText value="#{msg.modify_user_roles}" />
                                  '<h:outputText value="#{SpaceUsersBean.personName}" />'
diff --git a/source/web/jsp/roles/remove-content-user.jsp b/source/web/jsp/roles/remove-content-user.jsp
index bb76dc31f2..6ebb18a9d2 100644
--- a/source/web/jsp/roles/remove-content-user.jsp
+++ b/source/web/jsp/roles/remove-content-user.jsp
@@ -65,7 +65,7 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage url="/images/icons/delete_large.gif"/>
                            </td>
diff --git a/source/web/jsp/roles/remove-invited-user.jsp b/source/web/jsp/roles/remove-invited-user.jsp
index ecb48780dc..d3c26103e4 100644
--- a/source/web/jsp/roles/remove-invited-user.jsp
+++ b/source/web/jsp/roles/remove-invited-user.jsp
@@ -65,12 +65,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage url="/images/icons/delete_large.gif"/>
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{BrowseBean.actionSpace.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.remove_user}" /> '<h:outputText value="#{SpaceUsersBean.personName}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.remove_invited_user_info}" /></div>
                            </td>
diff --git a/source/web/jsp/users/change-password.jsp b/source/web/jsp/users/change-password.jsp
index f6df700969..87f9164f93 100644
--- a/source/web/jsp/users/change-password.jsp
+++ b/source/web/jsp/users/change-password.jsp
@@ -89,12 +89,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/edituser_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.change_password}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.change_password_description}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/add-content/properties.jsp b/source/web/jsp/wizard/add-content/properties.jsp
index 651ecda810..cc7736519d 100644
--- a/source/web/jsp/wizard/add-content/properties.jsp
+++ b/source/web/jsp/wizard/add-content/properties.jsp
@@ -90,12 +90,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/add_content_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{AddContentWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{AddContentWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/add-content/summary.jsp b/source/web/jsp/wizard/add-content/summary.jsp
index 497871638d..c788f0189b 100644
--- a/source/web/jsp/wizard/add-content/summary.jsp
+++ b/source/web/jsp/wizard/add-content/summary.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/add_content_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{AddContentWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{AddContentWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/add-content/upload.jsp b/source/web/jsp/wizard/add-content/upload.jsp
index e6ac7f440b..11c01eabfb 100644
--- a/source/web/jsp/wizard/add-content/upload.jsp
+++ b/source/web/jsp/wizard/add-content/upload.jsp
@@ -68,12 +68,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/add_content_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{AddContentWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{AddContentWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/create-action/action-add-features.jsp b/source/web/jsp/wizard/create-action/action-add-features.jsp
index 99097a9332..a4f224a3ff 100644
--- a/source/web/jsp/wizard/create-action/action-add-features.jsp
+++ b/source/web/jsp/wizard/create-action/action-add-features.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
                            </td>
diff --git a/source/web/jsp/wizard/create-action/action-check-in.jsp b/source/web/jsp/wizard/create-action/action-check-in.jsp
index a730a46155..a4d3293425 100644
--- a/source/web/jsp/wizard/create-action/action-check-in.jsp
+++ b/source/web/jsp/wizard/create-action/action-check-in.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
                            </td>
diff --git a/source/web/jsp/wizard/create-action/action-check-out.jsp b/source/web/jsp/wizard/create-action/action-check-out.jsp
index 6736656920..a50630b038 100644
--- a/source/web/jsp/wizard/create-action/action-check-out.jsp
+++ b/source/web/jsp/wizard/create-action/action-check-out.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
                            </td>
diff --git a/source/web/jsp/wizard/create-action/action-copy.jsp b/source/web/jsp/wizard/create-action/action-copy.jsp
index aae7fda570..92d11599ef 100644
--- a/source/web/jsp/wizard/create-action/action-copy.jsp
+++ b/source/web/jsp/wizard/create-action/action-copy.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
                            </td>
diff --git a/source/web/jsp/wizard/create-action/action-email.jsp b/source/web/jsp/wizard/create-action/action-email.jsp
index 6c0609b4d4..90b8d505b6 100644
--- a/source/web/jsp/wizard/create-action/action-email.jsp
+++ b/source/web/jsp/wizard/create-action/action-email.jsp
@@ -91,12 +91,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
                            </td>
diff --git a/source/web/jsp/wizard/create-action/action-import.jsp b/source/web/jsp/wizard/create-action/action-import.jsp
index d91aa46a55..463168fc76 100644
--- a/source/web/jsp/wizard/create-action/action-import.jsp
+++ b/source/web/jsp/wizard/create-action/action-import.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
                            </td>
diff --git a/source/web/jsp/wizard/create-action/action-link-category.jsp b/source/web/jsp/wizard/create-action/action-link-category.jsp
index 5e4ec5e04f..78132e65b9 100644
--- a/source/web/jsp/wizard/create-action/action-link-category.jsp
+++ b/source/web/jsp/wizard/create-action/action-link-category.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
-                           <td width="32">
+                        <tr>
+                           <td>
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
                            </td>
diff --git a/source/web/jsp/wizard/create-action/action-move.jsp b/source/web/jsp/wizard/create-action/action-move.jsp
index 3bd03c7e07..10431b7603 100644
--- a/source/web/jsp/wizard/create-action/action-move.jsp
+++ b/source/web/jsp/wizard/create-action/action-move.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
                            </td>
diff --git a/source/web/jsp/wizard/create-action/action-simple-workflow.jsp b/source/web/jsp/wizard/create-action/action-simple-workflow.jsp
index 1d3d4c4bfa..3221cc6612 100644
--- a/source/web/jsp/wizard/create-action/action-simple-workflow.jsp
+++ b/source/web/jsp/wizard/create-action/action-simple-workflow.jsp
@@ -105,12 +105,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
                            </td>
diff --git a/source/web/jsp/wizard/create-action/action-specialise-type.jsp b/source/web/jsp/wizard/create-action/action-specialise-type.jsp
index e1b9be1acd..ee75503bfb 100644
--- a/source/web/jsp/wizard/create-action/action-specialise-type.jsp
+++ b/source/web/jsp/wizard/create-action/action-specialise-type.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
                            </td>
diff --git a/source/web/jsp/wizard/create-action/action-transform-image.jsp b/source/web/jsp/wizard/create-action/action-transform-image.jsp
index fb91af3f4e..b779e60b98 100644
--- a/source/web/jsp/wizard/create-action/action-transform-image.jsp
+++ b/source/web/jsp/wizard/create-action/action-transform-image.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
                            </td>
diff --git a/source/web/jsp/wizard/create-action/action-transform.jsp b/source/web/jsp/wizard/create-action/action-transform.jsp
index 8724af8a0d..4488712794 100644
--- a/source/web/jsp/wizard/create-action/action-transform.jsp
+++ b/source/web/jsp/wizard/create-action/action-transform.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
                            </td>
diff --git a/source/web/jsp/wizard/create-action/action.jsp b/source/web/jsp/wizard/create-action/action.jsp
index 0aa08b0c35..a36000cfa1 100644
--- a/source/web/jsp/wizard/create-action/action.jsp
+++ b/source/web/jsp/wizard/create-action/action.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
                            </td>
diff --git a/source/web/jsp/wizard/create-action/summary.jsp b/source/web/jsp/wizard/create-action/summary.jsp
index 1a8690d156..cb7d484b4a 100644
--- a/source/web/jsp/wizard/create-action/summary.jsp
+++ b/source/web/jsp/wizard/create-action/summary.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewActionWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewActionWizard.wizardDescription}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'</div>
                            </td>
diff --git a/source/web/jsp/wizard/create-content/properties.jsp b/source/web/jsp/wizard/create-content/properties.jsp
index d8f2a6dff8..af92e807f2 100644
--- a/source/web/jsp/wizard/create-content/properties.jsp
+++ b/source/web/jsp/wizard/create-content/properties.jsp
@@ -91,12 +91,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_content_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{CreateContentWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{CreateContentWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/create-content/summary.jsp b/source/web/jsp/wizard/create-content/summary.jsp
index 88f4460952..3c4a883ecb 100644
--- a/source/web/jsp/wizard/create-content/summary.jsp
+++ b/source/web/jsp/wizard/create-content/summary.jsp
@@ -65,12 +65,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_content_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{CreateContentWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{CreateContentWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/invite-content-users/invite.jsp b/source/web/jsp/wizard/invite-content-users/invite.jsp
index b9f236a7a9..5e2342d0a4 100644
--- a/source/web/jsp/wizard/invite-content-users/invite.jsp
+++ b/source/web/jsp/wizard/invite-content-users/invite.jsp
@@ -64,13 +64,12 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/users_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{BrowseBean.document.name}' /></div>
-                              <div class="mainTitle"><h:outputText value="#{InviteContentUsersWizard.wizardTitle}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{InviteContentUsersWizard.wizardTitle}" /> '<h:outputText value='#{BrowseBean.document.name}' />'</div>
                               <div class="mainSubText"><h:outputText value="#{InviteContentUsersWizard.wizardDescription}" /></div>
                            </td>
                         </tr>
diff --git a/source/web/jsp/wizard/invite-content-users/notify.jsp b/source/web/jsp/wizard/invite-content-users/notify.jsp
index fa0e840588..290880b643 100644
--- a/source/web/jsp/wizard/invite-content-users/notify.jsp
+++ b/source/web/jsp/wizard/invite-content-users/notify.jsp
@@ -64,13 +64,12 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/users_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{BrowseBean.document.name}' /></div>
-                              <div class="mainTitle"><h:outputText value="#{InviteContentUsersWizard.wizardTitle}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{InviteContentUsersWizard.wizardTitle}" /> '<h:outputText value='#{BrowseBean.document.name}' />'</div>
                               <div class="mainSubText"><h:outputText value="#{InviteContentUsersWizard.wizardDescription}" /></div>
                            </td>
                         </tr>
diff --git a/source/web/jsp/wizard/invite-users/invite.jsp b/source/web/jsp/wizard/invite-users/invite.jsp
index 7544d646c7..bd51c92820 100644
--- a/source/web/jsp/wizard/invite-users/invite.jsp
+++ b/source/web/jsp/wizard/invite-users/invite.jsp
@@ -64,13 +64,12 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/users_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{BrowseBean.actionSpace.name}' /></div>
-                              <div class="mainTitle"><h:outputText value="#{InviteSpaceUsersWizard.wizardTitle}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{InviteSpaceUsersWizard.wizardTitle}" /> '<h:outputText value='#{BrowseBean.actionSpace.name}' />'</div>
                               <div class="mainSubText"><h:outputText value="#{InviteSpaceUsersWizard.wizardDescription}" /></div>
                            </td>
                         </tr>
diff --git a/source/web/jsp/wizard/invite-users/notify.jsp b/source/web/jsp/wizard/invite-users/notify.jsp
index 5e3685c817..59f8b2b797 100644
--- a/source/web/jsp/wizard/invite-users/notify.jsp
+++ b/source/web/jsp/wizard/invite-users/notify.jsp
@@ -64,13 +64,12 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/users_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{BrowseBean.actionSpace.name}' /></div>
-                              <div class="mainTitle"><h:outputText value="#{InviteSpaceUsersWizard.wizardTitle}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{InviteSpaceUsersWizard.wizardTitle}" /> '<h:outputText value='#{BrowseBean.actionSpace.name}' />'</div>
                               <div class="mainSubText"><h:outputText value="#{InviteSpaceUsersWizard.wizardDescription}" /></div>
                            </td>
                         </tr>
diff --git a/source/web/jsp/wizard/new-rule/action-add-features.jsp b/source/web/jsp/wizard/new-rule/action-add-features.jsp
index 7af463b459..b1a9cfca14 100644
--- a/source/web/jsp/wizard/new-rule/action-add-features.jsp
+++ b/source/web/jsp/wizard/new-rule/action-add-features.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/action-check-in.jsp b/source/web/jsp/wizard/new-rule/action-check-in.jsp
index d11b4c4c74..a0f85df742 100644
--- a/source/web/jsp/wizard/new-rule/action-check-in.jsp
+++ b/source/web/jsp/wizard/new-rule/action-check-in.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/action-check-out.jsp b/source/web/jsp/wizard/new-rule/action-check-out.jsp
index 8210b6fa77..acbd1e7e33 100644
--- a/source/web/jsp/wizard/new-rule/action-check-out.jsp
+++ b/source/web/jsp/wizard/new-rule/action-check-out.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/action-copy.jsp b/source/web/jsp/wizard/new-rule/action-copy.jsp
index 5570a1d8b9..4cc5ca8fd5 100644
--- a/source/web/jsp/wizard/new-rule/action-copy.jsp
+++ b/source/web/jsp/wizard/new-rule/action-copy.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/action-email.jsp b/source/web/jsp/wizard/new-rule/action-email.jsp
index 8ecf3577aa..df9209bee5 100644
--- a/source/web/jsp/wizard/new-rule/action-email.jsp
+++ b/source/web/jsp/wizard/new-rule/action-email.jsp
@@ -89,12 +89,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/action-import.jsp b/source/web/jsp/wizard/new-rule/action-import.jsp
index e5df48e2f0..2814eaafcd 100644
--- a/source/web/jsp/wizard/new-rule/action-import.jsp
+++ b/source/web/jsp/wizard/new-rule/action-import.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/action-link-category.jsp b/source/web/jsp/wizard/new-rule/action-link-category.jsp
index 50ba861537..d6a2cc3760 100644
--- a/source/web/jsp/wizard/new-rule/action-link-category.jsp
+++ b/source/web/jsp/wizard/new-rule/action-link-category.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/action-move.jsp b/source/web/jsp/wizard/new-rule/action-move.jsp
index 85cbb7bbfa..c8a02455dd 100644
--- a/source/web/jsp/wizard/new-rule/action-move.jsp
+++ b/source/web/jsp/wizard/new-rule/action-move.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/action-simple-workflow.jsp b/source/web/jsp/wizard/new-rule/action-simple-workflow.jsp
index d6dc55b1fe..d57cb57a5c 100644
--- a/source/web/jsp/wizard/new-rule/action-simple-workflow.jsp
+++ b/source/web/jsp/wizard/new-rule/action-simple-workflow.jsp
@@ -103,12 +103,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/action-specialise-type.jsp b/source/web/jsp/wizard/new-rule/action-specialise-type.jsp
index 334e3e86a6..ae3795e62e 100644
--- a/source/web/jsp/wizard/new-rule/action-specialise-type.jsp
+++ b/source/web/jsp/wizard/new-rule/action-specialise-type.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/action-transform-image.jsp b/source/web/jsp/wizard/new-rule/action-transform-image.jsp
index 89086ee3e2..bb1af92509 100644
--- a/source/web/jsp/wizard/new-rule/action-transform-image.jsp
+++ b/source/web/jsp/wizard/new-rule/action-transform-image.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/action-transform.jsp b/source/web/jsp/wizard/new-rule/action-transform.jsp
index 8bb3077f3d..12c716cd5d 100644
--- a/source/web/jsp/wizard/new-rule/action-transform.jsp
+++ b/source/web/jsp/wizard/new-rule/action-transform.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/action.jsp b/source/web/jsp/wizard/new-rule/action.jsp
index 9682b8d59c..9b8276839b 100644
--- a/source/web/jsp/wizard/new-rule/action.jsp
+++ b/source/web/jsp/wizard/new-rule/action.jsp
@@ -78,12 +78,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/condition-contains-text.jsp b/source/web/jsp/wizard/new-rule/condition-contains-text.jsp
index e5248b356e..bf4be2a857 100644
--- a/source/web/jsp/wizard/new-rule/condition-contains-text.jsp
+++ b/source/web/jsp/wizard/new-rule/condition-contains-text.jsp
@@ -72,12 +72,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/condition-has-aspect.jsp b/source/web/jsp/wizard/new-rule/condition-has-aspect.jsp
index 296e515e5d..2742d9cdcf 100644
--- a/source/web/jsp/wizard/new-rule/condition-has-aspect.jsp
+++ b/source/web/jsp/wizard/new-rule/condition-has-aspect.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/condition-has-mimetype.jsp b/source/web/jsp/wizard/new-rule/condition-has-mimetype.jsp
index f05d520974..4cb6a17d0d 100644
--- a/source/web/jsp/wizard/new-rule/condition-has-mimetype.jsp
+++ b/source/web/jsp/wizard/new-rule/condition-has-mimetype.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/condition-in-category.jsp b/source/web/jsp/wizard/new-rule/condition-in-category.jsp
index 79c0df7329..f8e25bfb22 100644
--- a/source/web/jsp/wizard/new-rule/condition-in-category.jsp
+++ b/source/web/jsp/wizard/new-rule/condition-in-category.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/condition-is-subtype.jsp b/source/web/jsp/wizard/new-rule/condition-is-subtype.jsp
index d4e817da64..e8c0f4672d 100644
--- a/source/web/jsp/wizard/new-rule/condition-is-subtype.jsp
+++ b/source/web/jsp/wizard/new-rule/condition-is-subtype.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/condition.jsp b/source/web/jsp/wizard/new-rule/condition.jsp
index 9f22720ba7..fb64561912 100644
--- a/source/web/jsp/wizard/new-rule/condition.jsp
+++ b/source/web/jsp/wizard/new-rule/condition.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/details.jsp b/source/web/jsp/wizard/new-rule/details.jsp
index 96e0db7809..0dc03a6789 100644
--- a/source/web/jsp/wizard/new-rule/details.jsp
+++ b/source/web/jsp/wizard/new-rule/details.jsp
@@ -72,12 +72,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-rule/summary.jsp b/source/web/jsp/wizard/new-rule/summary.jsp
index 2129125864..5667f9e6ba 100644
--- a/source/web/jsp/wizard/new-rule/summary.jsp
+++ b/source/web/jsp/wizard/new-rule/summary.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewRuleWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewRuleWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-space/create-from.jsp b/source/web/jsp/wizard/new-space/create-from.jsp
index 07883aeea8..525457ca93 100644
--- a/source/web/jsp/wizard/new-space/create-from.jsp
+++ b/source/web/jsp/wizard/new-space/create-from.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/create_space_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewSpaceWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewSpaceWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-space/details.jsp b/source/web/jsp/wizard/new-space/details.jsp
index c78ac91f06..506d0d6e14 100644
--- a/source/web/jsp/wizard/new-space/details.jsp
+++ b/source/web/jsp/wizard/new-space/details.jsp
@@ -106,12 +106,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/create_space_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewSpaceWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewSpaceWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-space/from-existing.jsp b/source/web/jsp/wizard/new-space/from-existing.jsp
index 25f4bbc2e1..6c18b2f4fe 100644
--- a/source/web/jsp/wizard/new-space/from-existing.jsp
+++ b/source/web/jsp/wizard/new-space/from-existing.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/create_space_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewSpaceWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewSpaceWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-space/from-scratch.jsp b/source/web/jsp/wizard/new-space/from-scratch.jsp
index 221e250c38..5c9e3a5f3c 100644
--- a/source/web/jsp/wizard/new-space/from-scratch.jsp
+++ b/source/web/jsp/wizard/new-space/from-scratch.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/create_space_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewSpaceWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewSpaceWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-space/from-template.jsp b/source/web/jsp/wizard/new-space/from-template.jsp
index 4377b69d16..ddd958dbed 100644
--- a/source/web/jsp/wizard/new-space/from-template.jsp
+++ b/source/web/jsp/wizard/new-space/from-template.jsp
@@ -86,12 +86,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/create_space_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewSpaceWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewSpaceWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-space/summary.jsp b/source/web/jsp/wizard/new-space/summary.jsp
index 9d5c265066..9ab3f1d30e 100644
--- a/source/web/jsp/wizard/new-space/summary.jsp
+++ b/source/web/jsp/wizard/new-space/summary.jsp
@@ -64,12 +64,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/create_space_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties["name"]}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewSpaceWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewSpaceWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-user/person-properties.jsp b/source/web/jsp/wizard/new-user/person-properties.jsp
index 820e2fb4c7..a783fcd1a6 100644
--- a/source/web/jsp/wizard/new-user/person-properties.jsp
+++ b/source/web/jsp/wizard/new-user/person-properties.jsp
@@ -90,12 +90,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_user_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewUserWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewUserWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-user/summary.jsp b/source/web/jsp/wizard/new-user/summary.jsp
index 942eff33c2..7808bf5f0c 100644
--- a/source/web/jsp/wizard/new-user/summary.jsp
+++ b/source/web/jsp/wizard/new-user/summary.jsp
@@ -65,12 +65,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_user_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewUserWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewUserWizard.wizardDescription}" /></div>
                            </td>
diff --git a/source/web/jsp/wizard/new-user/user-properties.jsp b/source/web/jsp/wizard/new-user/user-properties.jsp
index 5fd101a5a2..096caa1a15 100644
--- a/source/web/jsp/wizard/new-user/user-properties.jsp
+++ b/source/web/jsp/wizard/new-user/user-properties.jsp
@@ -109,12 +109,11 @@
                      <%-- Status and Actions inner contents table --%>
                      <%-- Generally this consists of an icon, textual summary and actions for the current object --%>
                      <table cellspacing="4" cellpadding="0" width="100%">
-                        <tr valign="top">
+                        <tr>
                            <td width="32">
                               <h:graphicImage id="wizard-logo" url="/images/icons/new_user_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainTitle"><h:outputText value="#{NewUserWizard.wizardTitle}" /></div>
                               <div class="mainSubText"><h:outputText value="#{NewUserWizard.wizardDescription}" /></div>
                            </td>