From 15ccee451c83d5230309ddb14b696424f51a310b Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Thu, 23 Feb 2006 10:13:05 +0000
Subject: [PATCH] . First pass of a new style for the header area in the
 web-client UI  - Reclaims a large ammount of unused vertical space at the top
 of the application

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2474 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/messages/webclient.properties |   5 +-
 .../org/alfresco/web/bean/NavigationBean.java |  22 ++-
 .../web/bean/users/UserMembersBean.java       |   2 +
 .../web/bean/wizard/NewRuleWizard.java        |   4 +-
 .../web/ui/common/component/UIMenu.java       |  12 +-
 .../web/ui/common/component/UIModeList.java   |  68 +++++++-
 .../ui/common/renderer/ModeListRenderer.java  | 160 ++++++++++++++----
 .../web/ui/common/tag/ModeListTag.java        |  28 +++
 source/web/WEB-INF/alfresco.tld               |  12 ++
 source/web/WEB-INF/faces-config-beans.xml     |   4 +
 source/web/css/main.css                       |   5 +
 source/web/images/icons/menu.gif              | Bin 0 -> 890 bytes
 source/web/jsp/browse/browse.jsp              | 104 ++++++------
 source/web/jsp/browse/dashboard.jsp           |  12 +-
 source/web/jsp/categories/categories.jsp      |  43 ++---
 source/web/jsp/categories/delete-category.jsp |   3 +-
 source/web/jsp/dialog/advanced-search.jsp     |  24 ++-
 source/web/jsp/dialog/checkin-file.jsp        |   3 +-
 source/web/jsp/dialog/checkout-file-link.jsp  |   3 +-
 source/web/jsp/dialog/checkout-file.jsp       |   3 +-
 source/web/jsp/dialog/delete-file.jsp         |   3 +-
 source/web/jsp/dialog/delete-rule.jsp         |   3 +-
 source/web/jsp/dialog/delete-space.jsp        |   3 +-
 source/web/jsp/dialog/document-details.jsp    |  75 ++++----
 source/web/jsp/dialog/edit-category.jsp       |   3 +-
 .../jsp/dialog/edit-document-properties.jsp   |   3 +-
 source/web/jsp/dialog/edit-file.jsp           |   3 +-
 source/web/jsp/dialog/edit-html-inline.jsp    |   3 +-
 .../web/jsp/dialog/edit-simple-workflow.jsp   |   3 +-
 source/web/jsp/dialog/edit-text-inline.jsp    |   3 +-
 source/web/jsp/dialog/export.jsp              |   3 +-
 source/web/jsp/dialog/import.jsp              |   3 +-
 source/web/jsp/dialog/preview-file.jsp        |   7 +-
 source/web/jsp/dialog/preview-space.jsp       |   7 +-
 source/web/jsp/dialog/rules.jsp               |  14 +-
 source/web/jsp/dialog/space-details.jsp       |  43 +++--
 source/web/jsp/dialog/undocheckout-file.jsp   |   3 +-
 source/web/jsp/dialog/update-file.jsp         |   3 +-
 source/web/jsp/forums/create-discussion.jsp   |   3 +-
 source/web/jsp/forums/create-forum.jsp        |   3 +-
 source/web/jsp/forums/create-forums.jsp       |   3 +-
 source/web/jsp/forums/create-post.jsp         |   3 +-
 source/web/jsp/forums/create-reply.jsp        |   3 +-
 source/web/jsp/forums/create-topic.jsp        |   3 +-
 source/web/jsp/forums/delete-forum.jsp        |   3 +-
 source/web/jsp/forums/delete-forums.jsp       |   3 +-
 source/web/jsp/forums/delete-post.jsp         |   3 +-
 source/web/jsp/forums/delete-topic.jsp        |   3 +-
 source/web/jsp/forums/edit-post.jsp           |   3 +-
 source/web/jsp/forums/forum-details.jsp       |  37 ++--
 source/web/jsp/forums/forum.jsp               |  47 ++---
 source/web/jsp/forums/forums-details.jsp      |  37 ++--
 source/web/jsp/forums/forums.jsp              |  51 +++---
 source/web/jsp/forums/topic-details.jsp       |  37 ++--
 source/web/jsp/forums/topic.jsp               |  47 ++---
 source/web/jsp/roles/manage-content-users.jsp |  18 +-
 source/web/jsp/roles/manage-invited-users.jsp |  18 +-
 source/web/jsp/users/delete-user.jsp          |   3 +-
 source/web/jsp/users/users.jsp                |  17 +-
 .../jsp/wizard/create-content/create-html.jsp |   3 +-
 .../jsp/wizard/create-content/create-text.jsp |   3 +-
 .../jsp/wizard/create-content/select-type.jsp |   3 +-
 62 files changed, 623 insertions(+), 433 deletions(-)
 create mode 100644 source/web/images/icons/menu.gif

diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index c360e617b9..43e3a8dab4 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -69,6 +69,7 @@ results_contains_filter=Results for ''{0}'' in ''{1}''.
 details_view=Details View
 view_icon=Icon View
 view_browse=Browse View
+create_options=Create
 more_options=More...
 more_actions=More Actions
 more_options_space=More Actions for this Space
@@ -209,7 +210,7 @@ delete_rule=Delete Rule
 delete_user=Delete User
 remove_user=Remove User
 new_space=Create Space
-add_content=Add Content
+add_content=Quick Upload
 create_content=Create Content
 add_multiple_files=Add Multiple Files
 import_directory=Import Directory
@@ -279,7 +280,7 @@ also_search_results=More search options
 additional_options=Additional options
 save_new_search=Save New Search
 save_edit_search=Save Modified Search
-saved_searches=Saved Search Options
+saved_searches=My Saved Search Options
 title_save_search=Save Search Query
 save_search_description=Save a search query for use again later
 search_props=Saved Search Properties
diff --git a/source/java/org/alfresco/web/bean/NavigationBean.java b/source/java/org/alfresco/web/bean/NavigationBean.java
index 3847938aad..d5dddd6139 100644
--- a/source/java/org/alfresco/web/bean/NavigationBean.java
+++ b/source/java/org/alfresco/web/bean/NavigationBean.java
@@ -38,6 +38,7 @@ import org.alfresco.service.cmr.repository.NodeService;
 import org.alfresco.service.cmr.repository.Path;
 import org.alfresco.service.cmr.repository.TemplateImageResolver;
 import org.alfresco.service.cmr.repository.TemplateNode;
+import org.alfresco.service.cmr.rule.RuleService;
 import org.alfresco.service.cmr.search.SearchService;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.NamespaceService;
@@ -97,6 +98,14 @@ public class NavigationBean
       this.namespaceService = namespaceService;
    }
    
+   /**
+    * @param ruleService The ruleService to use
+    */
+   public void setRuleService(RuleService ruleService)
+   {
+      this.ruleService = ruleService;
+   }
+   
    /**
     * @param cifsServer The cifsServer to set.
     */
@@ -189,6 +198,15 @@ public class NavigationBean
       this.helpUrl = helpUrl;
    }
    
+   /**
+    * @return the number of rules associated with the current space
+    */
+   public int getRuleCount()
+   {
+       Node node = getCurrentNode();
+       return (node != null ? this.ruleService.countRules(node.getNodeRef()) : 0);
+   }
+   
    /**
     * @return Returns the search context object if any.
     */
@@ -361,7 +379,6 @@ public class NavigationBean
          Path path = this.nodeService.getPath(nodeRef);
          
          // resolve CIFS network folder location for this node
-         
          DiskSharedDevice diskShare = cifsServer.getConfiguration().getPrimaryFilesystem();
          
          if (diskShare != null)
@@ -650,6 +667,9 @@ public class NavigationBean
    /** NamespaceService bean reference */
    protected NamespaceService namespaceService;
    
+   /** RuleService bean reference*/
+   protected RuleService ruleService;
+   
    /** CIFSServer bean reference */
    protected CIFSServer cifsServer;
    
diff --git a/source/java/org/alfresco/web/bean/users/UserMembersBean.java b/source/java/org/alfresco/web/bean/users/UserMembersBean.java
index df0446212a..17cce89b4a 100644
--- a/source/java/org/alfresco/web/bean/users/UserMembersBean.java
+++ b/source/java/org/alfresco/web/bean/users/UserMembersBean.java
@@ -99,6 +99,7 @@ public abstract class UserMembersBean
    /** roles for current person */
    private List<PermissionWrapper> personRoles = null;
    
+   
    // ------------------------------------------------------------------------------
    // Abstract methods
    
@@ -109,6 +110,7 @@ public abstract class UserMembersBean
     */
    public abstract Node getNode();
    
+   
    // ------------------------------------------------------------------------------
    // Bean property getters and setters
 
diff --git a/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java b/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java
index c4bc15bae8..a030052cf7 100644
--- a/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java
+++ b/source/java/org/alfresco/web/bean/wizard/NewRuleWizard.java
@@ -111,8 +111,8 @@ public class NewRuleWizard extends BaseActionWizard
    private boolean editingAction;
    private boolean editingCondition;
 
-   private RuleService ruleService;
-   private RulesBean rulesBean;
+   protected RuleService ruleService;
+   protected RulesBean rulesBean;
    
    private List<SelectItem> modelTypes;
    private List<SelectItem> mimeTypes;
diff --git a/source/java/org/alfresco/web/ui/common/component/UIMenu.java b/source/java/org/alfresco/web/ui/common/component/UIMenu.java
index 881a63b6fe..f32ac525e2 100644
--- a/source/java/org/alfresco/web/ui/common/component/UIMenu.java
+++ b/source/java/org/alfresco/web/ui/common/component/UIMenu.java
@@ -18,6 +18,7 @@ package org.alfresco.web.ui.common.component;
 
 import java.io.IOException;
 
+import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import javax.faces.el.ValueBinding;
@@ -53,7 +54,7 @@ public class UIMenu extends SelfRenderingComponent
       ResponseWriter out = context.getResponseWriter();
       
       // output a textual label with an optional icon to show the menu
-      String menuId = getNextMenuId(context);
+      String menuId = getNextMenuId(this, context);
       out.write("<a href='#' onclick=\"javascript:_toggleMenu(event, '");
       out.write(menuId);
       out.write("');return false;\"");
@@ -66,9 +67,7 @@ public class UIMenu extends SelfRenderingComponent
       String label = getLabel();
       if (label != null)
       {
-         out.write("<span>");
          out.write(Utils.encode(label));
-         out.write("</span>");
       }
       
       // output image
@@ -80,7 +79,6 @@ public class UIMenu extends SelfRenderingComponent
       out.write("</a>");
       
       // output the hidden DIV section to contain the menu item table
-      // also output the javascript handlers used to hide the menu after a delay of non-use
       out.write("<br><div id='");
       out.write(menuId);
       out.write("' style=\"position:absolute;display:none;padding-left:2px;\">");
@@ -180,7 +178,7 @@ public class UIMenu extends SelfRenderingComponent
    
    
    // ------------------------------------------------------------------------------
-   // Private helpers
+   // Helpers
    
    /**
     * Return the next usable menu DIV id in a sequence
@@ -189,7 +187,7 @@ public class UIMenu extends SelfRenderingComponent
     * 
     * @return next menu ID
     */
-   private String getNextMenuId(FacesContext context)
+   public static String getNextMenuId(UIComponent component, FacesContext context)
    {
       Integer val = (Integer)context.getExternalContext().getRequestMap().get(MENU_ID_KEY);
       if (val == null)
@@ -198,7 +196,7 @@ public class UIMenu extends SelfRenderingComponent
       }
       
       // build next id in sequence
-      String id = getClientId(context) + '_' + val.toString();
+      String id = component.getClientId(context) + '_' + val.toString();
       
       // save incremented value in the request ready for next menu component instance
       val = Integer.valueOf( val.intValue() + 1 );
diff --git a/source/java/org/alfresco/web/ui/common/component/UIModeList.java b/source/java/org/alfresco/web/ui/common/component/UIModeList.java
index bb2812e6f1..058925f37c 100644
--- a/source/java/org/alfresco/web/ui/common/component/UIModeList.java
+++ b/source/java/org/alfresco/web/ui/common/component/UIModeList.java
@@ -64,6 +64,8 @@ public class UIModeList extends UICommand
       this.horizontal = (Boolean)values[2];
       this.disabled = (Boolean)values[3];
       this.label = (String)values[4];
+      this.menu = (Boolean)values[5];
+      this.menuImage = (String)values[6];
    }
    
    /**
@@ -71,13 +73,15 @@ public class UIModeList extends UICommand
     */
    public Object saveState(FacesContext context)
    {
-      Object values[] = new Object[5];
+      Object values[] = new Object[7];
       // standard component attributes are saved by the super class
       values[0] = super.saveState(context);
       values[1] = this.iconColumnWidth;
       values[2] = this.horizontal;
       values[3] = this.disabled;
       values[4] = this.label;
+      values[5] = this.menu;
+      values[6] = this.menuImage;
       return (values);
    }
    
@@ -202,6 +206,40 @@ public class UIModeList extends UICommand
       this.disabled = disabled;
    }
    
+   /**
+    * Returns the menu rendering flag
+    * 
+    * @return true if the menu rendering mode is to be used
+    */
+   public boolean isMenu()
+   {
+      ValueBinding vb = getValueBinding("menu");
+      if (vb != null)
+      {
+         this.menu = (Boolean)vb.getValue(getFacesContext());
+      }
+      
+      if (this.menu != null)
+      {
+         return this.menu.booleanValue();
+      }
+      else
+      {
+         // return the default
+         return false;
+      }
+   }
+
+   /**
+    * Sets whether the mode list is a menu
+    * 
+    * @param menu       the menu flag
+    */
+   public void setMenu(boolean menu)
+   {
+      this.menu = menu;
+   }
+   
    /**
     * @return Returns the label.
     */
@@ -224,6 +262,28 @@ public class UIModeList extends UICommand
       this.label = label;
    }
    
+   /**
+    * @return Returns the menu image.
+    */
+   public String getMenuImage()
+   {
+      ValueBinding vb = getValueBinding("menuImage");
+      if (vb != null)
+      {
+         this.menuImage = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.menuImage;
+   }
+
+   /**
+    * @param menuImage The menu image to set.
+    */
+   public void setMenuImage(String menuImage)
+   {
+      this.menuImage = menuImage;
+   }
+   
    
    // ------------------------------------------------------------------------------
    // Private data 
@@ -237,6 +297,12 @@ public class UIModeList extends UICommand
    /** disabled flag */
    private Boolean disabled = null;
    
+   /** menu rendering flag */
+   private Boolean menu = null;
+   
+   /** menu image to use */
+   private String menuImage = null;
+   
    /** the label */
    private String label;
    
diff --git a/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java
index 2a4e37ed43..0669c5354b 100644
--- a/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java
+++ b/source/java/org/alfresco/web/ui/common/renderer/ModeListRenderer.java
@@ -28,6 +28,7 @@ import javax.faces.context.ResponseWriter;
 
 import org.alfresco.web.ui.common.Utils;
 import org.alfresco.web.ui.common.component.UIListItem;
+import org.alfresco.web.ui.common.component.UIMenu;
 import org.alfresco.web.ui.common.component.UIModeList;
 
 /**
@@ -74,54 +75,137 @@ public class ModeListRenderer extends BaseRenderer
       
       ResponseWriter out = context.getResponseWriter();
 
-      // start outer table container the list items
       Map attrs = list.getAttributes();
-      out.write("<table cellspacing=1 cellpadding=0");
-      outputAttribute(out, attrs.get("styleClass"), "class");
-      outputAttribute(out, attrs.get("style"), "style");
-      outputAttribute(out, attrs.get("width"), "width");
-      out.write('>');
       
-      // horizontal rendering outputs a single row with each item as a column cell
-      if (list.isHorizontal() == true)
+      if (list.isMenu() == false)
       {
-         out.write("<tr>");
-      }
-      
-      // output title row if present
-      if (list.getLabel() != null)
-      {
-         // each row is an inner table with a single row and 2 columns
-         // first column contains an icon if present, second column contains text
-         if (list.isHorizontal() == false)
+         // start outer table container the list items
+         out.write("<table cellspacing=1 cellpadding=0");
+         outputAttribute(out, attrs.get("styleClass"), "class");
+         outputAttribute(out, attrs.get("style"), "style");
+         outputAttribute(out, attrs.get("width"), "width");
+         out.write('>');
+         
+         // horizontal rendering outputs a single row with each item as a column cell
+         if (list.isHorizontal() == true)
          {
             out.write("<tr>");
          }
          
-         out.write("<td><table cellpadding=0 width=100%");
-         outputAttribute(out, attrs.get("itemSpacing"), "cellspacing");
-         out.write("><tr>");
-         
-         // output icon column
-         if (list.getIconColumnWidth() != 0)
+         // output title row if present
+         if (list.getLabel() != null)
+         {
+            // each row is an inner table with a single row and 2 columns
+            // first column contains an icon if present, second column contains text
+            if (list.isHorizontal() == false)
+            {
+               out.write("<tr>");
+            }
+            
+            out.write("<td><table cellpadding=0 width=100%");
+            outputAttribute(out, attrs.get("itemSpacing"), "cellspacing");
+            out.write("><tr>");
+            
+            // output icon column
+            if (list.getIconColumnWidth() != 0)
+            {
+               out.write("<td");
+               outputAttribute(out, list.getIconColumnWidth(), "width");
+               out.write("></td>");
+            }
+            
+            // output title label
+            out.write("<td><span");
+            outputAttribute(out, attrs.get("labelStyle"), "style");
+            outputAttribute(out, attrs.get("labelStyleClass"), "class");
+            out.write('>');
+            out.write(Utils.encode(list.getLabel()));
+            out.write("</span></td></tr></table></td>");
+            
+            if (list.isHorizontal() == false)
+            {
+               out.write("</tr>");
+            }
+         }
+      }
+      else
+      {
+         // render as a pop-up menu
+         // TODO: show the image set for the individual item if available?
+         out.write("<table cellspacing=0 cellpadding=0 style='white-space:nowrap'><tr>");
+         String selectedImage = (String)attrs.get("selectedImage");
+         if (selectedImage != null)
          {
             out.write("<td");
-            outputAttribute(out, list.getIconColumnWidth(), "width");
-            out.write("></td>");
+            int colWidth = list.getIconColumnWidth();
+            if (colWidth != 0)
+            {
+               out.write(" width=");
+               out.write(Integer.toString(colWidth));
+            }
+            out.write('>');
+            out.write(Utils.buildImageTag(context, selectedImage, null, "absmiddle"));
+            out.write("</td>");
          }
          
-         // output title label
-         out.write("<td><span");
-         outputAttribute(out, attrs.get("labelStyle"), "style");
-         outputAttribute(out, attrs.get("labelStyleClass"), "class");
-         out.write('>');
-         out.write(Utils.encode(list.getLabel()));
-         out.write("</span></td></tr></table></td>");
+         String menuId = UIMenu.getNextMenuId(list, context);
+         out.write("<td><a href='#' onclick=\"javascript:_toggleMenu(event, '");
+         out.write(menuId);
+         out.write("');return false;\">");
          
-         if (list.isHorizontal() == false)
+         // use default label if available
+         String label = list.getLabel();
+         if (label == null || label.length() == 0)
          {
-            out.write("</tr>");
+            // else get the child components and walk to find the selected
+            for (Iterator i=list.getChildren().iterator(); i.hasNext(); /**/)
+            {
+               UIComponent child = (UIComponent)i.next();
+               if (child instanceof UIListItem && child.isRendered() == true)
+               {
+                  // found a valid UIListItem child to render
+                  UIListItem item = (UIListItem)child;
+                  
+                  // if selected render as the label
+                  if (item.getValue().equals(list.getValue()) == true)
+                  {
+                     label = item.getLabel();
+                     break;
+                  }
+               }
+            }
          }
+         
+         // render the label
+         if (label != null && label.length() != 0)
+         {
+            out.write("<span");
+            outputAttribute(out, attrs.get("labelStyle"), "style");
+            outputAttribute(out, attrs.get("labelStyleClass"), "class");
+            out.write('>');
+            out.write(Utils.encode(label));
+            out.write("</span>");
+         }
+         
+         // output image
+         if (list.getMenuImage() != null)
+         {
+            out.write(Utils.buildImageTag(context, list.getMenuImage(), null, "absmiddle"));
+         }
+         
+         out.write("</a></td></tr></table>");
+         
+         // output the hidden DIV section to contain the menu item table
+         out.write("<div id='");
+         out.write(menuId);
+         out.write("' style=\"position:absolute;display:none;padding-left:2px;\">");
+         
+         // start outer table container the list items
+         out.write("<table cellspacing=1 cellpadding=0");
+         outputAttribute(out, attrs.get("styleClass"), "class");
+         outputAttribute(out, attrs.get("style"), "style");
+         outputAttribute(out, attrs.get("width"), "width");
+         out.write('>');
       }
    }
    
@@ -263,11 +347,17 @@ public class ModeListRenderer extends BaseRenderer
       ResponseWriter out = context.getResponseWriter();
       
       // end outer table
-      if (((UIModeList)component).isHorizontal() == true)
+      UIModeList list = (UIModeList)component;
+      if (list.isHorizontal() == true)
       {
          out.write("</tr>");
       }
       out.write("</table>");
+      if (list.isMenu() == true)
+      {
+         // close menu hidden div section
+         out.write("</div>");
+      }
    }
 
    /**
diff --git a/source/java/org/alfresco/web/ui/common/tag/ModeListTag.java b/source/java/org/alfresco/web/ui/common/tag/ModeListTag.java
index 977f52ea6c..ac1821287b 100644
--- a/source/java/org/alfresco/web/ui/common/tag/ModeListTag.java
+++ b/source/java/org/alfresco/web/ui/common/tag/ModeListTag.java
@@ -64,6 +64,8 @@ public class ModeListTag extends HtmlComponentTag
       setIntProperty(component, "itemSpacing", this.itemSpacing);
       setIntProperty(component, "iconColumnWidth", this.iconColumnWidth);
       setIntProperty(component, "width", this.width);
+      setStringProperty(component, "menuImage", this.menuImage);
+      setBooleanProperty(component, "menu", this.menu);
       setBooleanProperty(component, "horizontal", this.horizontal);
       setBooleanProperty(component, "disabled", this.disabled);
       setStringProperty(component, "label", this.label);
@@ -319,7 +321,33 @@ public class ModeListTag extends HtmlComponentTag
    {
       this.disabledStyleClass = disabledStyleClass;
    }
+   
+   /**
+    * Set the menu
+    *
+    * @param menu     the menu
+    */
+   public void setMenu(String menu)
+   {
+      this.menu = menu;
+   }
 
+   /**
+    * Set the menuImage
+    *
+    * @param menuImage     the menuImage
+    */
+   public void setMenuImage(String menuImage)
+   {
+      this.menuImage = menuImage;
+   }
+
+
+   /** the menu */
+   private String menu;
+
+   /** the menuImage */
+   private String menuImage;
 
    /** the disabledStyle */
    private String disabledStyle;
diff --git a/source/web/WEB-INF/alfresco.tld b/source/web/WEB-INF/alfresco.tld
index b20a635e36..5ad13c67bd 100644
--- a/source/web/WEB-INF/alfresco.tld
+++ b/source/web/WEB-INF/alfresco.tld
@@ -996,6 +996,18 @@
          <required>false</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
+      
+      <attribute>
+         <name>menu</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      
+      <attribute>
+         <name>menuImage</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
    </tag>
    
    <tag>
diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml
index 383ba341a6..9079a17621 100644
--- a/source/web/WEB-INF/faces-config-beans.xml
+++ b/source/web/WEB-INF/faces-config-beans.xml
@@ -56,6 +56,10 @@
          <property-name>cifsServer</property-name>
          <value>#{cifsServer}</value>
       </managed-property>
+      <managed-property>
+         <property-name>ruleService</property-name>
+         <value>#{RuleService}</value>
+      </managed-property>
    </managed-bean>
    
    <managed-bean>
diff --git a/source/web/css/main.css b/source/web/css/main.css
index 7320d922a3..55149a4e5a 100644
--- a/source/web/css/main.css
+++ b/source/web/css/main.css
@@ -185,6 +185,11 @@ a.headbarLink
    font-size: 10px;
 }
 
+.separator
+{
+   background-color: #92A8C0;
+}
+
 .moreActionsMenu
 {
    background-color: #eeeeee;
diff --git a/source/web/images/icons/menu.gif b/source/web/images/icons/menu.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b6e53877f454ea9ef661d72ef644761ea550e5db
GIT binary patch
literal 890
zcmb_a>q}E%7=L!Q>6w@uUoUey+7wN)F)bprfvk(VnUs){!9Hj*oto_64L2Q3(_B=v
zEmN$#rG-+$0!y)*n^8K_DJT>K874$T*|!8`J-hfH^n5ty_g;RNhv&^x=VoS=F~C3<
z_{!_`LPZ~?yU)Ko$gk-StsbCj2P5hqG3-cm^SIFD5H^jAS|<|PpCxw9By~)tTz_-$
z)|{;SeR{9^NZ*GOgNp+80WmyIy*4eo`SMuLTgAPFoY9s1v9-d9k428pC6iw?QyZl-
zo8_;+YiEDxTt9t||E)M2g%+q1za+=|)k};=16YzTBNj2SWJ>aR02}}XdgiM0n6j)j
zY~J5E)mMR_zlKi_RL6uUM_5KU-rOW~OtgxS4iFy0Y4)d;#y)8PpbD&|QHn8Cn|mmK
z7e6FgVO_390G`XW;WkgZ%^7%YPSXt#fvh|GM~Oj$3dAB4c?z9Umg`QBea><gQ*hHJ
z$gv5|5)(r~GBNG|)Y*=I+GWAY@QGm*QxRi>^;eut!1jKdwPovV*_VK#iD{CUZUET1
z1+OIe832(I^%iLfK}P^JChP|LE{b9CAOL8v1LOc4Mwb78OIq$C5P4Ljh4%0GKD#^i
zKqL^JA%=ByAtosXKt}-d&9EuuB2NiYf{~QJZORvZB7m7=-P~-8P~jkmaf=xLA_XIn
z_SJ=iWdOmROCZ4B3ja73?6iHAJ3ocoy@TLP{Y%74cp-r6^gW1!vOcaL(z6`@bhxY%
zmYhX!zH@sxsG)~)6fXpg7V4^?sS)&QsMkV+9BQke62Lciti){|7a$dI)_{)!p9OsZ
z&e39(W5{`hj!M(av!$J3(FatPtyw1(PRp6N_2mu$k;-&BR%r$<|4_5|Pur;wKA(t-
is!n!v?PKDSi!LUe4($&sw!@5rTDhvaomL#jfZ`w8VEFm~

literal 0
HcmV?d00001

diff --git a/source/web/jsp/browse/browse.jsp b/source/web/jsp/browse/browse.jsp
index 8d3d1396a3..2802127b9d 100644
--- a/source/web/jsp/browse/browse.jsp
+++ b/source/web/jsp/browse/browse.jsp
@@ -73,7 +73,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>
  
                            <%-- actions for browse mode --%>
                            <a:panel id="browse-actions" rendered="#{NavigationBean.searchContext == null}">
@@ -82,27 +82,42 @@
                               </td>
                               <td>
                                  <%-- Summary --%>
-                                 <div class="mainSubTitle"><h:outputText value="#{msg.product_name}" id="msg1" /></div>
                                  <div class="mainTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" id="msg2" />&nbsp;<a:actionLink image="/images/icons/opennetwork.gif" value="#{msg.network_folder} #{NavigationBean.nodeProperties.cifsPathLabel}" showLink="false" href="#{NavigationBean.nodeProperties.cifsPath}" rendered="#{NavigationBean.nodeProperties.cifsPath != null}" target="new" id="cifs" /></div>
                                  <div class="mainSubText"><h:outputText value="#{msg.view_description}" id="msg3" /></div>
                                  <div class="mainSubText"><h:outputText value="#{NavigationBean.nodeProperties.description}" id="msg4" /></div>
-                                 <%--<div style="padding-top:2px"><a:statusMessage id="status1" border="yellowInner" bgcolor="#ffffcc" binding="#{BrowseBean.statusMessage}" /></div>--%>
                               </td>
-                              <td bgcolor="#465F7D" width=1></td>
-                              <td width=110 style="padding-left:2px">
-                                 <%-- Current object actions --%>
-                                 <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" id="msg5" /><br>
-                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval1">
-                                    <a:actionLink value="#{msg.new_space}" image="/images/icons/create_space.gif" padding="4" action="createSpace" actionListener="#{NewSpaceDialog.startWizard}" id="link1" />
-                                 </r:permissionEvaluator>
+                              <td style="padding-right:4px" align=right>
+                                 <nobr>
+                                 <%-- Additional summary info --%>
+                                 <img src="<%=request.getContextPath()%>/images/icons/rule.gif" width=16 height=16> <h:outputText value="(#{NavigationBean.ruleCount})" id="rulemsg1" style="vertical-align:20%" />
+                                 </nobr>
+                              </td>
+                              <td class="separator" width=1></td>
+                              <td style="padding-left:4px" align=right>
+                                 <%-- Quick upload action --%>
+                                 <nobr>
                                  <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval2">
-                                    <a:actionLink value="#{msg.add_content}" image="/images/icons/add.gif" padding="4" action="addContent" actionListener="#{AddContentWizard.startWizard}" id="link3" />
+                                    <a:actionLink value="#{msg.add_content}" image="/images/icons/add.gif" action="addContent" actionListener="#{AddContentWizard.startWizard}" style="white-space:nowrap" id="link3" />
                                  </r:permissionEvaluator>
-                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval3">
-                                    <a:actionLink value="#{msg.create_content}" image="/images/icons/new_content.gif" id="link3_1" padding="4" action="createContent" actionListener="#{CreateContentWizard.startWizard}" />
-                                 </r:permissionEvaluator>
-                                 <%-- Current space More actions menu --%>
-                                 <a:menu id="spaceMenu" itemSpacing="4" label="#{msg.more_options}" image="/images/icons/more.gif" tooltip="#{msg.more_options_space}" menuStyleClass="moreActionsMenu" style="padding-left:20px">
+                                 </nobr>
+                              </td>
+                              <td style="padding-left:4px" width=52>
+                                 <%-- Create actions menu --%>
+                                 <a:menu id="createMenu" itemSpacing="4" label="#{msg.create_options}" image="/images/icons/menu.gif" menuStyleClass="moreActionsMenu" style="white-space:nowrap">
+                                    <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval3">
+                                       <a:actionLink value="#{msg.create_content}" image="/images/icons/new_content.gif" id="link3_1" action="createContent" actionListener="#{CreateContentWizard.startWizard}" />
+                                    </r:permissionEvaluator>
+                                    <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval1">
+                                       <a:actionLink value="#{msg.new_space}" image="/images/icons/create_space.gif" action="createSpace" actionListener="#{NewSpaceDialog.startWizard}" id="link1" />
+                                    </r:permissionEvaluator>
+                                    <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval6">
+                                       <a:actionLink value="#{msg.advanced_space_wizard}" image="/images/icons/create_space.gif" action="createAdvancedSpace" actionListener="#{NewSpaceWizard.startWizard}" id="link9" />
+                                    </r:permissionEvaluator>
+                                 </a:menu>
+                              </td>
+                              <td style="padding-left:4px" width=80>
+                                 <%-- More actions menu --%>
+                                 <a:menu id="actionsMenu" itemSpacing="4" label="#{msg.more_actions}" image="/images/icons/menu.gif" menuStyleClass="moreActionsMenu" style="white-space:nowrap">
                                     <a:actionLink value="#{msg.view_details}" image="/images/icons/View_details.gif" action="dialog:showSpaceDetails" actionListener="#{BrowseBean.setupSpaceAction}" id="link5">
                                        <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param6" />
                                     </a:actionLink>
@@ -120,9 +135,6 @@
                                     <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Write" id="eval5">
                                        <a:actionLink value="#{msg.paste_all}" image="/images/icons/paste.gif" actionListener="#{ClipboardBean.pasteAll}" id="link8" />
                                     </r:permissionEvaluator>
-                                    <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval6">
-                                       <a:actionLink value="#{msg.advanced_space_wizard}" image="/images/icons/create_space.gif" action="createAdvancedSpace" actionListener="#{NewSpaceWizard.startWizard}" id="link9" />
-                                    </r:permissionEvaluator>
                                     <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="ChangePermissions" id="eval3_1">
                                        <a:actionLink value="#{msg.manage_invited_users}" image="/images/icons/invite.gif" id="link4" action="dialog:manageInvitedUsers" actionListener="#{BrowseBean.setupSpaceAction}">
                                           <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param6_1" />
@@ -148,37 +160,36 @@
                               </td>
                               <td>
                                  <%-- Summary --%>
-                                 <div class="mainSubTitle"><h:outputText value="#{msg.product_name}" id="msg10" /></div>
                                  <div class="mainTitle"><h:outputText value="#{msg.search_results}" id="msg11" /></div>
-                                 <div class="mainSubText">
-                                    <h:outputFormat value="#{msg.search_detail}" id="msg12">
-                                       <f:param value="#{NavigationBean.searchContext.text}" id="param2" />
-                                    </h:outputFormat>
-                                 </div>
+                                 <div class="mainSubText"><h:outputFormat value="#{msg.search_detail}" id="msg12"><f:param value="#{NavigationBean.searchContext.text}" id="param2" /></h:outputFormat></div>
                                  <div class="mainSubText"><h:outputText value="#{msg.search_description}" id="msg13" /></div>
-                                 <%--<div style="padding-top:2px"><a:statusMessage id="status2" border="yellowInner" bgcolor="#ffffcc" binding="#{BrowseBean.statusMessage}" /></div>--%>
                               </td>
-                              <td bgcolor="#465F7D" width=1></td>
-                              <td width=135 style="padding-left:2px">
-                                 <%-- Current object actions --%>
-                                 <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" id="msg14" /><br>
-                                 <a:actionLink value="#{msg.new_search}" image="/images/icons/search_icon.gif" padding="4" action="advSearch" id="link20" />
-                                 <a:booleanEvaluator value="#{NavigationBean.isGuest == false}" id="eval0">
-                                    <a:actionLink value="#{msg.save_new_search}" image="/images/icons/save_search.gif" padding="4" action="#{AdvancedSearchBean.saveNewSearch}" id="link20_1" />
-                                    <a:booleanEvaluator value="#{AdvancedSearchBean.allowEdit == true}" id="eval0_1">
-                                       <a:actionLink value="#{msg.save_edit_search}" image="/images/icons/edit_search.gif" padding="4" action="#{AdvancedSearchBean.saveEditSearch}" id="link20_2" />
+                              <td style="padding-right:4px" align=right>
+                                 <%-- Close Search action --%>
+                                 <nobr><a:actionLink value="#{msg.close_search}" image="/images/icons/action.gif" style="white-space:nowrap" actionListener="#{BrowseBean.closeSearch}" id="link21" /></nobr>
+                              </td>
+                              <td style="padding-right:4px" width=80>
+                                 <%-- New Search actions --%>
+                                 <nobr><a:actionLink value="#{msg.new_search}" image="/images/icons/search_icon.gif" style="white-space:nowrap" action="advSearch" id="link20" /></nobr>
+                              </td>
+                              <td style="padding-left:4px" width=90>
+                                 <%-- More Search actions --%>
+                                 <a:menu id="searchMenu" itemSpacing="4" label="#{msg.more_actions}" image="/images/icons/menu.gif" menuStyleClass="moreActionsMenu" style="white-space:nowrap">
+                                    <a:booleanEvaluator value="#{NavigationBean.isGuest == false}" id="eval0">
+                                       <a:actionLink value="#{msg.save_new_search}" image="/images/icons/save_search.gif" padding="4" action="#{AdvancedSearchBean.saveNewSearch}" id="link20_1" />
+                                       <a:booleanEvaluator value="#{AdvancedSearchBean.allowEdit == true}" id="eval0_1">
+                                          <a:actionLink value="#{msg.save_edit_search}" image="/images/icons/edit_search.gif" padding="4" action="#{AdvancedSearchBean.saveEditSearch}" id="link20_2" />
+                                       </a:booleanEvaluator>
                                     </a:booleanEvaluator>
-                                 </a:booleanEvaluator>
-                                 <a:actionLink value="#{msg.close_search}" image="/images/icons/action.gif" padding="4" actionListener="#{BrowseBean.closeSearch}" id="link21" />
+                                 </a:menu>
                               </td>
                            </a:panel>
                            
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=110>
+                           <td class="separator" width=1></td>
+                           <td width=110 valign=middle>
                               <%-- View mode settings --%>
-                              <h:outputText style="padding-left:26px" styleClass="mainSubTitle" value="#{msg.view}"/><br>
-                              <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" disabledStyleClass="statusListDisabled" selectedImage="/images/icons/Details.gif"
-                                    value="#{BrowseBean.browseViewMode}" actionListener="#{BrowseBean.viewModeChanged}">
+                              <a:modeList itemSpacing="4" iconColumnWidth="20" selectedStyleClass="statusListHighlight" disabledStyleClass="statusListDisabled" selectedImage="/images/icons/Details.gif"
+                                    value="#{BrowseBean.browseViewMode}" actionListener="#{BrowseBean.viewModeChanged}" menu="true" menuImage="/images/icons/menu.gif" styleClass="moreActionsMenu">
                                  <a:listItem value="details" label="#{msg.details_view}" />
                                  <a:listItem value="icons" label="#{msg.view_icon}" />
                                  <a:listItem value="list" label="#{msg.view_browse}" />
@@ -202,8 +213,7 @@
                <%-- Details - Spaces --%>
                <tr valign=top>
                   <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
-                  <td>
-                     <div style="padding:4px">
+                  <td style="padding:4px">
                      
                      <a:panel id="spaces-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" label="#{msg.browse_spaces}">
                      
@@ -346,8 +356,6 @@
                      
                      </a:panel>
                      
-                     <div>
-                     
                   </td>
                   <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
                </tr>
@@ -355,8 +363,7 @@
                <%-- Details - Content --%>
                <tr valign=top>
                   <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
-                  <td>
-                     <div style="padding:4px">
+                  <td style="padding:4px">
                      
                      <a:panel id="content-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" label="#{msg.browse_content}">
                      
@@ -547,7 +554,6 @@
                      
                      </a:panel>
                      
-                     </div>
                   </td>
                   <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
                </tr>
diff --git a/source/web/jsp/browse/dashboard.jsp b/source/web/jsp/browse/dashboard.jsp
index ab453a4dbd..c9acaa6d06 100644
--- a/source/web/jsp/browse/dashboard.jsp
+++ b/source/web/jsp/browse/dashboard.jsp
@@ -66,7 +66,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>
  
                            <%-- actions for browse mode --%>
                            <td width=32>
@@ -74,18 +74,16 @@
                            </td>
                            <td>
                               <%-- Summary --%>
-                              <div class="mainSubTitle"><h:outputText value="#{msg.product_name}" id="msg1" /></div>
                               <div class="mainTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" id="msg2" />&nbsp;<a:actionLink image="/images/icons/opennetwork.gif" value="#{msg.network_folder} #{NavigationBean.nodeProperties.cifsPathLabel}" showLink="false" href="#{NavigationBean.nodeProperties.cifsPath}" rendered="#{NavigationBean.nodeProperties.cifsPath != null}" target="new" id="cifs" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.view_description}" id="msg3" /></div>
                               <div class="mainSubText"><h:outputText value="#{NavigationBean.nodeProperties.description}" id="msg4" /></div>
                            </td>
                            
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=110>
+                           <td class="separator" width=1></td>
+                           <td width=110 valign=middle>
                               <%-- View mode settings --%>
-                              <h:outputText style="padding-left:26px" styleClass="mainSubTitle" value="#{msg.view}"/><br>
-                              <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" disabledStyleClass="statusListDisabled" selectedImage="/images/icons/Details.gif"
-                                    value="dashboard" actionListener="#{BrowseBean.viewModeChanged}">
+                              <a:modeList itemSpacing="4" iconColumnWidth="20" selectedStyleClass="statusListHighlight" disabledStyleClass="statusListDisabled" selectedImage="/images/icons/Details.gif"
+                                    value="dashboard" actionListener="#{BrowseBean.viewModeChanged}" menu="true" menuImage="/images/icons/menu.gif" styleClass="moreActionsMenu">
                                  <a:listItem value="details" label="#{msg.details_view}" />
                                  <a:listItem value="icons" label="#{msg.view_icon}" />
                                  <a:listItem value="list" label="#{msg.view_browse}" />
diff --git a/source/web/jsp/categories/categories.jsp b/source/web/jsp/categories/categories.jsp
index 3a80d79ad6..952eb2df95 100644
--- a/source/web/jsp/categories/categories.jsp
+++ b/source/web/jsp/categories/categories.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/category.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.category_management}" /></div>
                               <div class="mainSubTitle">
                                  <%-- show either root message or the current category name --%>
@@ -78,26 +77,32 @@
                               </div>
                               <div class="mainSubText"><h:outputText value="#{msg.categories_description}" /></div>
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=110 style="padding-left:2px">
-                              <%-- Current object actions --%>
-                              <h:outputText style="padding-left:20px;" styleClass="mainSubTitle" value="#{msg.actions}" /><br/>
-                              <a:actionLink value="#{msg.add_category}" image="/images/icons/add_category.gif" padding="4" action="addCategory" actionListener="#{CategoriesBean.clearCategoryAction}" />
-                              <a:booleanEvaluator value="#{CategoriesBean.currentCategoryId != null}">
-                                 <a:actionLink value="#{msg.edit_category}" image="/images/icons/edit_category.gif" padding="4" action="editCategory" actionListener="#{CategoriesBean.setupCategoryAction}">
-                                    <f:param name="id" value="#{CategoriesBean.currentCategoryId}" />
-                                 </a:actionLink>
-                                 <a:actionLink value="#{msg.delete_category}" image="/images/icons/delete_category.gif" padding="4" action="deleteCategory" actionListener="#{CategoriesBean.setupCategoryAction}">
-                                    <f:param name="id" value="#{CategoriesBean.currentCategoryId}" />
-                                 </a:actionLink>
-                              </a:booleanEvaluator>
+                           
+                           <td style="padding-left:4px" width=52>
+                              <%-- Create actions menu --%>
+                              <a:menu id="createMenu" itemSpacing="4" label="#{msg.create_options}" image="/images/icons/menu.gif" menuStyleClass="moreActionsMenu" style="white-space:nowrap">
+                                 <a:actionLink value="#{msg.add_category}" image="/images/icons/add_category.gif" action="addCategory" actionListener="#{CategoriesBean.clearCategoryAction}" />
+                              </a:menu>
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=100 style="padding-left:2px">
+                           <td style="padding-left:4px" width=80>
+                              <%-- More actions menu --%>
+                              <a:menu id="actionsMenu" itemSpacing="4" label="#{msg.more_actions}" image="/images/icons/menu.gif" menuStyleClass="moreActionsMenu" style="white-space:nowrap">
+                                 <a:booleanEvaluator value="#{CategoriesBean.currentCategoryId != null}">
+                                    <a:actionLink value="#{msg.edit_category}" image="/images/icons/edit_category.gif" action="editCategory" actionListener="#{CategoriesBean.setupCategoryAction}">
+                                       <f:param name="id" value="#{CategoriesBean.currentCategoryId}" />
+                                    </a:actionLink>
+                                    <a:actionLink value="#{msg.delete_category}" image="/images/icons/delete_category.gif" action="deleteCategory" actionListener="#{CategoriesBean.setupCategoryAction}">
+                                       <f:param name="id" value="#{CategoriesBean.currentCategoryId}" />
+                                    </a:actionLink>
+                                 </a:booleanEvaluator>
+                              </a:menu>
+                           </td>
+                           
+                           <td class="separator" width=1></td>
+                           <td width=110 valign=middle>
                               <%-- View mode settings --%>
-                              <h:outputText style="padding-left:26px" styleClass="mainSubTitle" value="#{msg.view}"/><br>
                               <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" selectedImage="/images/icons/Details.gif"
-                                    value="#{CategoriesBean.viewMode}" actionListener="#{CategoriesBean.viewModeChanged}">
+                                    value="#{CategoriesBean.viewMode}" actionListener="#{CategoriesBean.viewModeChanged}" menu="true" menuImage="/images/icons/menu.gif" styleClass="moreActionsMenu">
                                  <a:listItem value="icons" label="#{msg.category_icons}" />
                                  <a:listItem value="details" label="#{msg.category_details}" />
                               </a:modeList>
diff --git a/source/web/jsp/categories/delete-category.jsp b/source/web/jsp/categories/delete-category.jsp
index 65686387b4..06dd350890 100644
--- a/source/web/jsp/categories/delete-category.jsp
+++ b/source/web/jsp/categories/delete-category.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_category_large.gif"/>
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.delete_category}" /> '<h:outputText value="#{CategoriesBean.actionCategory.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.delete_category_info}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/advanced-search.jsp b/source/web/jsp/dialog/advanced-search.jsp
index bc9300437f..ed3944bbc7 100644
--- a/source/web/jsp/dialog/advanced-search.jsp
+++ b/source/web/jsp/dialog/advanced-search.jsp
@@ -76,33 +76,31 @@
                      <%-- 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>
                               <img src="<%=request.getContextPath()%>/images/icons/search_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.advanced_search}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.advancedsearch_description}" /></div>
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=80 style="padding-left:2px">
-                              <%-- Current object actions --%>
-                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" /><br>
-                              <a:actionLink value="#{msg.resetall}" image="/images/icons/delete.gif" padding="4" actionListener="#{AdvancedSearchBean.reset}" />
+                           
+                           <td align=right>
+                              <a:actionLink value="#{msg.resetall}" image="/images/icons/delete.gif" padding="4" actionListener="#{AdvancedSearchBean.reset}" style="white-space:nowrap" />
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=200 style="padding-left:2px">
+                           <td class="separator" width=1></td>
+                           <td width=80 style="padding-left:4px">
                               <%-- Available Saved Searches --%>
-                              <center><h:outputText styleClass="mainSubTitle" value="#{msg.saved_searches}" /></center>
-                              <div style="padding-top:4px">
+                              <div style="padding-top:4px" style="white-space:nowrap">
                                  <a:modeList itemSpacing="3" iconColumnWidth="20" style="text-align:right" selectedStyleClass="statusListHighlight" disabledStyleClass="statusListDisabled" selectedImage="/images/icons/Details.gif"
-                                       value="#{AdvancedSearchBean.savedSearchMode}" actionListener="#{AdvancedSearchBean.savedSearchModeChanged}">
+                                       value="#{AdvancedSearchBean.savedSearchMode}" actionListener="#{AdvancedSearchBean.savedSearchModeChanged}" menu="true" menuImage="/images/icons/menu.gif" styleClass="moreActionsMenu" label="#{msg.saved_searches}">
                                     <a:listItem value="user" label="#{msg.user_searches}" />
                                     <a:listItem value="global" label="#{msg.global_searches}" />
                                  </a:modeList>
                               </div>
-                              <div style="white-space:nowrap">
+                           </td>
+                           <td width=128 style="padding-left:4px">
+                              <div>
                                  <%-- Saved Searches drop-down selector --%>
                                  <%-- uses a nasty hack to execute an ActionListener for the drop-down.
                                       tried using a valueChangedListener+formsubmit but the valueChangedListener
diff --git a/source/web/jsp/dialog/checkin-file.jsp b/source/web/jsp/dialog/checkin-file.jsp
index 7bbc808454..6a30defdb5 100644
--- a/source/web/jsp/dialog/checkin-file.jsp
+++ b/source/web/jsp/dialog/checkin-file.jsp
@@ -69,12 +69,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/check_in_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.check_in}" /> '<h:outputText value="#{CheckinCheckoutBean.document.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.checkinfile_description}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/checkout-file-link.jsp b/source/web/jsp/dialog/checkout-file-link.jsp
index 3e0448ab62..5bcaa2f9d6 100644
--- a/source/web/jsp/dialog/checkout-file-link.jsp
+++ b/source/web/jsp/dialog/checkout-file-link.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/check_out_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.check_out_of}" /> '<h:outputText value="#{CheckinCheckoutBean.document.name}" />' Complete</div>
                               <div class="mainSubText"><h:outputText value="#{msg.checkoutfilelink_description}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/checkout-file.jsp b/source/web/jsp/dialog/checkout-file.jsp
index 6ac7e2ac7c..c1ac8ac394 100644
--- a/source/web/jsp/dialog/checkout-file.jsp
+++ b/source/web/jsp/dialog/checkout-file.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/check_out_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.check_out}" /> '<h:outputText value="#{CheckinCheckoutBean.document.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.checkoutfile_description}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/delete-file.jsp b/source/web/jsp/dialog/delete-file.jsp
index da36180684..228626540a 100644
--- a/source/web/jsp/dialog/delete-file.jsp
+++ b/source/web/jsp/dialog/delete-file.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="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.delete_file}" /> '<h:outputText value="#{BrowseBean.document.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.delete_file_info}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/delete-rule.jsp b/source/web/jsp/dialog/delete-rule.jsp
index 4f98bd916f..f8e09ad580 100644
--- a/source/web/jsp/dialog/delete-rule.jsp
+++ b/source/web/jsp/dialog/delete-rule.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="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.delete_rule}" /> '<h:outputText value="#{RulesBean.currentRule.title}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.delete_rule_info}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/delete-space.jsp b/source/web/jsp/dialog/delete-space.jsp
index 93ccb65fc6..2126763bb7 100644
--- a/source/web/jsp/dialog/delete-space.jsp
+++ b/source/web/jsp/dialog/delete-space.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="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.delete_space}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.delete_space_info}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/document-details.jsp b/source/web/jsp/dialog/document-details.jsp
index 809224c56f..060e60b161 100644
--- a/source/web/jsp/dialog/document-details.jsp
+++ b/source/web/jsp/dialog/document-details.jsp
@@ -64,63 +64,64 @@
                      <%-- 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">
                               <img src="<%=request.getContextPath()%>/images/icons/details_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.details_of}" /> '<h:outputText value="#{DocumentDetailsBean.name}" />'<r:lockIcon value="#{DocumentDetailsBean.document.nodeRef}" align="absmiddle" />
                               </div>
                               <div class="mainSubText"><h:outputText value="#{msg.location}" />: <r:nodePath value="#{DocumentDetailsBean.document.nodeRef}" breadcrumb="true" actionListener="#{BrowseBean.clickSpacePath}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.documentdetails_description}" /></div>
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=100 style="padding-left:2px">
-                              <%-- Current object actions --%>
-                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" />
-                              
-                              <%-- checkin, checkout and undo checkout --%>
+                           
+                           <td align=right>
+                              <%-- Checkin/Checkout action --%>
+                              <nobr>
                               <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="CheckOut">
                                  <a:booleanEvaluator value="#{DocumentDetailsBean.locked == false && DocumentDetailsBean.workingCopy == false}">
-                                    <a:actionLink value="#{msg.checkout}" image="/images/icons/CheckOut_icon.gif" padding="4"
+                                    <a:actionLink value="#{msg.checkout}" image="/images/icons/CheckOut_icon.gif" padding="4" style="white-space:nowrap" 
                                                   actionListener="#{CheckinCheckoutBean.setupContentAction}" action="checkoutFile">
                                        <f:param name="id" value="#{DocumentDetailsBean.id}" />
                                     </a:actionLink>
                                  </a:booleanEvaluator>
                               </r:permissionEvaluator>
-                              
                               <a:booleanEvaluator value="#{DocumentDetailsBean.document.properties.checkIn == true}">
-                                 <a:actionLink value="#{msg.checkin}" image="/images/icons/CheckIn_icon.gif" padding="4"
+                                 <a:actionLink value="#{msg.checkin}" image="/images/icons/CheckIn_icon.gif" padding="4" style="white-space:nowrap" 
                                                actionListener="#{CheckinCheckoutBean.setupContentAction}" action="checkinFile">
                                     <f:param name="id" value="#{DocumentDetailsBean.id}" />
                                  </a:actionLink>
                               </a:booleanEvaluator>
+                              </nobr>
+                           </td>
+                           
+                           <td style="padding-left:4px" width=64>
+                              <%-- Actions menu --%>
+                              <a:menu id="actionsMenu" itemSpacing="4" label="#{msg.actions}" image="/images/icons/menu.gif"
+                                    menuStyleClass="moreActionsMenu" style="white-space:nowrap" tooltip="#{msg.more_options_file}">
+                                 
+                                 <a:booleanEvaluator value="#{DocumentDetailsBean.document.properties.cancelCheckOut == true}">
+                                    <a:actionLink value="#{msg.undocheckout}" image="/images/icons/undo_checkout.gif" 
+                                                  actionListener="#{CheckinCheckoutBean.setupContentAction}" action="undoCheckoutFile">
+                                       <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </a:booleanEvaluator>
+                                 
+                                 <%-- approve and reject --%>
+                                 <a:booleanEvaluator value="#{DocumentDetailsBean.approveStepName != null && DocumentDetailsBean.workingCopy == false && DocumentDetailsBean.locked == false}">
+                                    <a:actionLink value="#{DocumentDetailsBean.approveStepName}" image="/images/icons/approve.gif"
+                                                  actionListener="#{DocumentDetailsBean.approve}" action="browse">
+                                       <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </a:booleanEvaluator>
+                                 <a:booleanEvaluator value="#{DocumentDetailsBean.rejectStepName != null && DocumentDetailsBean.workingCopy == false && DocumentDetailsBean.locked == false}">
+                                    <a:actionLink value="#{DocumentDetailsBean.rejectStepName}" image="/images/icons/reject.gif"
+                                                  actionListener="#{DocumentDetailsBean.reject}" action="browse">
+                                       <f:param name="id" value="#{DocumentDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </a:booleanEvaluator>
                               
-                              <a:booleanEvaluator value="#{DocumentDetailsBean.document.properties.cancelCheckOut == true}">
-                                 <a:actionLink value="#{msg.undocheckout}" image="/images/icons/undo_checkout.gif" padding="4" 
-                                               actionListener="#{CheckinCheckoutBean.setupContentAction}" action="undoCheckoutFile">
-                                    <f:param name="id" value="#{DocumentDetailsBean.id}" />
-                                 </a:actionLink>
-                              </a:booleanEvaluator>
-                              
-                              <%-- approve and reject --%>
-                              <a:booleanEvaluator value="#{DocumentDetailsBean.approveStepName != null && DocumentDetailsBean.workingCopy == false && DocumentDetailsBean.locked == false}">
-                                 <a:actionLink value="#{DocumentDetailsBean.approveStepName}" image="/images/icons/approve.gif" padding="4"
-                                               actionListener="#{DocumentDetailsBean.approve}" action="browse">
-                                    <f:param name="id" value="#{DocumentDetailsBean.id}" />
-                                 </a:actionLink>
-                              </a:booleanEvaluator>
-                              <a:booleanEvaluator value="#{DocumentDetailsBean.rejectStepName != null && DocumentDetailsBean.workingCopy == false && DocumentDetailsBean.locked == false}">
-                                 <a:actionLink value="#{DocumentDetailsBean.rejectStepName}" image="/images/icons/reject.gif" padding="4"
-                                               actionListener="#{DocumentDetailsBean.reject}" action="browse">
-                                    <f:param name="id" value="#{DocumentDetailsBean.id}" />
-                                 </a:actionLink>
-                              </a:booleanEvaluator>
-                              
-                              <a:menu itemSpacing="4" image="/images/icons/more.gif" menuStyleClass="moreActionsMenu"
-                                      label="#{msg.more_options}" tooltip="#{msg.more_options_file}" style="padding-left:20px">
                                  <%-- edit and update --%>
                                  <r:permissionEvaluator value="#{DocumentDetailsBean.document}" allow="Write">
                                     <a:booleanEvaluator value="#{(DocumentDetailsBean.locked == false && DocumentDetailsBean.workingCopy == false) || DocumentDetailsBean.owner == true}">
@@ -199,8 +200,12 @@
                               </a:menu>
                            </td>
                            
+                           
+                           <%-- TODO: FINISH --%>
+                           
+                           
                            <%-- Navigation --%>
-                           <td bgcolor="#465F7D" width=1></td>
+                           <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">
diff --git a/source/web/jsp/dialog/edit-category.jsp b/source/web/jsp/dialog/edit-category.jsp
index 575f9aecbf..d0b0bb71cd 100644
--- a/source/web/jsp/dialog/edit-category.jsp
+++ b/source/web/jsp/dialog/edit-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/edit_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.modify_categories_of}" /> '<h:outputText value="#{BrowseBean.document.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.editcategory_description}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/edit-document-properties.jsp b/source/web/jsp/dialog/edit-document-properties.jsp
index 0edd7a09b5..0c5fc79b0c 100644
--- a/source/web/jsp/dialog/edit-document-properties.jsp
+++ b/source/web/jsp/dialog/edit-document-properties.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/details_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.modify_props_of}" /> '<h:outputText value="#{BrowseBean.document.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.editdocument_description}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/edit-file.jsp b/source/web/jsp/dialog/edit-file.jsp
index 5c174e9119..c3c0ed9495 100644
--- a/source/web/jsp/dialog/edit-file.jsp
+++ b/source/web/jsp/dialog/edit-file.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="26">
                               <h:graphicImage id="wizard-logo" url="/images/icons/edit_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle">'<h:outputText value="#{CheckinCheckoutBean.document.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.editfile_description}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/edit-html-inline.jsp b/source/web/jsp/dialog/edit-html-inline.jsp
index 40df9d3404..4430c68a08 100644
--- a/source/web/jsp/dialog/edit-html-inline.jsp
+++ b/source/web/jsp/dialog/edit-html-inline.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/edit_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle">'<h:outputText value="#{CheckinCheckoutBean.document.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.editfileinline_description}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/edit-simple-workflow.jsp b/source/web/jsp/dialog/edit-simple-workflow.jsp
index 402053b101..b43b25679f 100644
--- a/source/web/jsp/dialog/edit-simple-workflow.jsp
+++ b/source/web/jsp/dialog/edit-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/edit_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.modify_workflow_props}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.editworkflow_description}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/edit-text-inline.jsp b/source/web/jsp/dialog/edit-text-inline.jsp
index c78e368ebe..bb9dc42047 100644
--- a/source/web/jsp/dialog/edit-text-inline.jsp
+++ b/source/web/jsp/dialog/edit-text-inline.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/edit_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle">'<h:outputText value="#{CheckinCheckoutBean.document.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.editfileinline_description}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/export.jsp b/source/web/jsp/dialog/export.jsp
index af253ab095..befe48ab5f 100644
--- a/source/web/jsp/dialog/export.jsp
+++ b/source/web/jsp/dialog/export.jsp
@@ -87,12 +87,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/export_large.gif" />
                            </td>
                            <td>
-                              <div class="mainTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainSubTitle"><h:outputText value="#{msg.export}"/></div>
                               <div class="mainSubText"><h:outputText value="#{msg.export_info}"/></div>
                            </td>
diff --git a/source/web/jsp/dialog/import.jsp b/source/web/jsp/dialog/import.jsp
index 4ae219508a..c4f9f7f987 100644
--- a/source/web/jsp/dialog/import.jsp
+++ b/source/web/jsp/dialog/import.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/import_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.import}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.import_info}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/preview-file.jsp b/source/web/jsp/dialog/preview-file.jsp
index 693ebb6640..ba351cb383 100644
--- a/source/web/jsp/dialog/preview-file.jsp
+++ b/source/web/jsp/dialog/preview-file.jsp
@@ -64,18 +64,17 @@
                      <%-- 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">
                               <img src="<%=request.getContextPath()%>/images/icons/preview_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.preview_of}" /> '<h:outputText value="#{DocumentPreviewBean.name}" />'<r:lockIcon value="#{DocumentPreviewBean.node.nodeRef}" align="absmiddle" />
                               </div>
                               <div class="mainSubText"><h:outputText value="#{msg.previewdocument_description}" /></div>
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
+                           <td class="separator" width=1></td>
                            <td width=100 style="padding-left:2px">
                               <%-- Available Templates --%>
                               <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.templates}" />
@@ -89,7 +88,7 @@
                            </td>
                            
                            <%-- Navigation --%>
-                           <td bgcolor="#465F7D" width=1></td>
+                           <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">
diff --git a/source/web/jsp/dialog/preview-space.jsp b/source/web/jsp/dialog/preview-space.jsp
index 8120d2150c..e4a7c0ca30 100644
--- a/source/web/jsp/dialog/preview-space.jsp
+++ b/source/web/jsp/dialog/preview-space.jsp
@@ -64,18 +64,17 @@
                      <%-- 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">
                               <img src="<%=request.getContextPath()%>/images/icons/preview_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.preview_of}" /> '<h:outputText value="#{SpacePreviewBean.name}" />'<r:lockIcon value="#{SpacePreviewBean.node.nodeRef}" align="absmiddle" />
                               </div>
                               <div class="mainSubText"><h:outputText value="#{msg.previewdocument_description}" /></div>
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
+                           <td class="separator" width=1></td>
                            <td width=100 style="padding-left:2px">
                               <%-- Available Templates --%>
                               <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.templates}" />
@@ -89,7 +88,7 @@
                            </td>
                            
                            <%-- Navigation --%>
-                           <td bgcolor="#465F7D" width=1></td>
+                           <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">
diff --git a/source/web/jsp/dialog/rules.jsp b/source/web/jsp/dialog/rules.jsp
index 6fcd1257b2..f94c416cfa 100644
--- a/source/web/jsp/dialog/rules.jsp
+++ b/source/web/jsp/dialog/rules.jsp
@@ -64,28 +64,24 @@
                      <%-- 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/rule_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{BrowseBean.actionSpace.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.content_rules}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.space_rules_description}" /></div>
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width="100" style="padding-left:2px">
+                           <td align=right>
                               <%-- Current object actions --%>
-                              <h:outputText style="padding-left:20px;" styleClass="mainSubTitle" value="#{msg.actions}" /><br/>
                               <a:actionLink value="#{msg.create_rule}" image="/images/icons/new_rule.gif" padding="4" action="createRule" actionListener="#{NewRuleWizard.startWizard}" />
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
+                           <td class="separator" width=1></td>
                            <td width="125" style="padding-left:2px">
                               <%-- Filters --%>
-                              <h:outputText style="padding-left:26px;padding-bottom:4px;" styleClass="mainSubTitle" value="#{msg.filter_contents}" /><br/>
                               <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight"
-                                    value="#{RulesBean.viewMode}" actionListener="#{RulesBean.viewModeChanged}" 
-                                    selectedImage="/images/icons/Details.gif">
+                                    value="#{RulesBean.viewMode}" actionListener="#{RulesBean.viewModeChanged}" menu="true" menuImage="/images/icons/menu.gif" styleClass="moreActionsMenu"
+                                    selectedImage="/images/icons/Details.gif" label="#{msg.filter_contents}">
                                  <a:listItem value="inherited" label="#{msg.inherited}" />
                                  <a:listItem value="local" label="#{msg.local}" />
                               </a:modeList>
diff --git a/source/web/jsp/dialog/space-details.jsp b/source/web/jsp/dialog/space-details.jsp
index d13cfa05fe..7ed5cf156e 100644
--- a/source/web/jsp/dialog/space-details.jsp
+++ b/source/web/jsp/dialog/space-details.jsp
@@ -64,38 +64,37 @@
                      <%-- 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">
                               <img src="<%=request.getContextPath()%>/images/icons/details_large.gif" width=32 height=32>
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{SpaceDetailsBean.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.details_of}" /> '<h:outputText value="#{SpaceDetailsBean.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.location}" />: <r:nodePath value="#{SpaceDetailsBean.space.nodeRef}" breadcrumb="true" actionListener="#{BrowseBean.clickSpacePath}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.spacedetails_description}" /></div>
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=100 style="padding-left:2px">
-                              <%-- Current object actions --%>
-                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" /><br>
+                           
+                           <td align=right>
+                              <%-- Actions menu --%>
+                              <a:menu id="actionsMenu" itemSpacing="4" label="#{msg.actions}" image="/images/icons/menu.gif"
+                                    menuStyleClass="moreActionsMenu" style="white-space:nowrap" tooltip="#{msg.more_options_space}">
                               
-                              <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
-                                 <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" padding="4" actionListener="#{ClipboardBean.cutNode}">
+                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
+                                    <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" actionListener="#{ClipboardBean.cutNode}">
+                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                                 
+                                 <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" actionListener="#{ClipboardBean.copyNode}">
                                     <f:param name="id" value="#{SpaceDetailsBean.id}" />
                                  </a:actionLink>
-                              </r:permissionEvaluator>
-                              
-                              <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" padding="4" actionListener="#{ClipboardBean.copyNode}">
-                                 <f:param name="id" value="#{SpaceDetailsBean.id}" />
-                              </a:actionLink>
-                              
-                              <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
-                                 <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" padding="4" action="dialog:deleteSpace" actionListener="#{BrowseBean.setupSpaceAction}">
-                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
-                                 </a:actionLink>
-                              </r:permissionEvaluator>
-                              
-                              <a:menu itemSpacing="4" label="#{msg.more_options}" image="/images/icons/more.gif" tooltip="#{msg.more_options_space}" menuStyleClass="moreActionsMenu" style="padding-left:20px">
+                                 
+                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
+                                    <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" action="dialog:deleteSpace" 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.import}" image="/images/icons/import.gif" action="dialog:import" actionListener="#{BrowseBean.setupSpaceAction}">
                                        <f:param name="id" value="#{SpaceDetailsBean.id}" />
@@ -141,7 +140,7 @@
                            </td>
                            
                            <%-- Navigation --%>
-                           <td bgcolor="#465F7D" width=1></td>
+                           <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">
diff --git a/source/web/jsp/dialog/undocheckout-file.jsp b/source/web/jsp/dialog/undocheckout-file.jsp
index bfe271f919..a093647aaf 100644
--- a/source/web/jsp/dialog/undocheckout-file.jsp
+++ b/source/web/jsp/dialog/undocheckout-file.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/cancel_checkout_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.undo_checkout_for}" /> '<h:outputText value="#{CheckinCheckoutBean.document.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.undocheckoutfile_description}" /></div>
                            </td>
diff --git a/source/web/jsp/dialog/update-file.jsp b/source/web/jsp/dialog/update-file.jsp
index 36c796df38..7ca116868a 100644
--- a/source/web/jsp/dialog/update-file.jsp
+++ b/source/web/jsp/dialog/update-file.jsp
@@ -69,12 +69,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/update_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.update}" /> '<h:outputText value="#{CheckinCheckoutBean.document.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.updatefile_description}" /></div>
                            </td>
diff --git a/source/web/jsp/forums/create-discussion.jsp b/source/web/jsp/forums/create-discussion.jsp
index a8375f3942..b629d1f206 100644
--- a/source/web/jsp/forums/create-discussion.jsp
+++ b/source/web/jsp/forums/create-discussion.jsp
@@ -80,12 +80,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_topic_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.create_topic}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.create_topic_description}" /></div>
                            </td>
diff --git a/source/web/jsp/forums/create-forum.jsp b/source/web/jsp/forums/create-forum.jsp
index 16eeab5f9c..65d5006e82 100644
--- a/source/web/jsp/forums/create-forum.jsp
+++ b/source/web/jsp/forums/create-forum.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_forum_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.create_forum}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.create_forum_description}" /></div>
                            </td>
diff --git a/source/web/jsp/forums/create-forums.jsp b/source/web/jsp/forums/create-forums.jsp
index 8cd9954eb9..ecc0060740 100644
--- a/source/web/jsp/forums/create-forums.jsp
+++ b/source/web/jsp/forums/create-forums.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_forums_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.create_forums}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.create_forums_description}" /></div>
                            </td>
diff --git a/source/web/jsp/forums/create-post.jsp b/source/web/jsp/forums/create-post.jsp
index c576f09260..dc4dcfdae7 100644
--- a/source/web/jsp/forums/create-post.jsp
+++ b/source/web/jsp/forums/create-post.jsp
@@ -79,12 +79,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_post_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.create_post}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.create_post_description}" /></div>
                            </td>
diff --git a/source/web/jsp/forums/create-reply.jsp b/source/web/jsp/forums/create-reply.jsp
index bcab771cf5..cb69fa2acf 100644
--- a/source/web/jsp/forums/create-reply.jsp
+++ b/source/web/jsp/forums/create-reply.jsp
@@ -80,12 +80,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/post_reply_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.post_reply}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.create_reply_description}" /></div>
                            </td>
diff --git a/source/web/jsp/forums/create-topic.jsp b/source/web/jsp/forums/create-topic.jsp
index ca52c509ec..ff275c25c2 100644
--- a/source/web/jsp/forums/create-topic.jsp
+++ b/source/web/jsp/forums/create-topic.jsp
@@ -80,12 +80,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_topic_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.create_topic}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.create_topic_description}" /></div>
                            </td>
diff --git a/source/web/jsp/forums/delete-forum.jsp b/source/web/jsp/forums/delete-forum.jsp
index 7927ee074d..289f18acff 100644
--- a/source/web/jsp/forums/delete-forum.jsp
+++ b/source/web/jsp/forums/delete-forum.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_forum_large.gif"/>
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.delete_forum}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.delete_forum_info}" /></div>
                            </td>
diff --git a/source/web/jsp/forums/delete-forums.jsp b/source/web/jsp/forums/delete-forums.jsp
index affdb72a85..b8784137a0 100644
--- a/source/web/jsp/forums/delete-forums.jsp
+++ b/source/web/jsp/forums/delete-forums.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_forums_large.gif"/>
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.delete_forums}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.delete_forums_info}" /></div>
                            </td>
diff --git a/source/web/jsp/forums/delete-post.jsp b/source/web/jsp/forums/delete-post.jsp
index bc2ef852ef..8c14341e65 100644
--- a/source/web/jsp/forums/delete-post.jsp
+++ b/source/web/jsp/forums/delete-post.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="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.delete_post}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.delete_post_info}" /></div>
                            </td>
diff --git a/source/web/jsp/forums/delete-topic.jsp b/source/web/jsp/forums/delete-topic.jsp
index c79e5ff447..33b24b1aa1 100644
--- a/source/web/jsp/forums/delete-topic.jsp
+++ b/source/web/jsp/forums/delete-topic.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_topic_large.gif"/>
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.delete_topic}" /> '<h:outputText value="#{BrowseBean.actionSpace.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.delete_topic_info}" /></div>
                            </td>
diff --git a/source/web/jsp/forums/edit-post.jsp b/source/web/jsp/forums/edit-post.jsp
index 08b397a29a..9f6ecf10d0 100644
--- a/source/web/jsp/forums/edit-post.jsp
+++ b/source/web/jsp/forums/edit-post.jsp
@@ -79,12 +79,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/edit_post_large.gif" />
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.edit_post}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.edit_post_description}" /></div>
                            </td>
diff --git a/source/web/jsp/forums/forum-details.jsp b/source/web/jsp/forums/forum-details.jsp
index 48f1a34850..4dd50ddd58 100644
--- a/source/web/jsp/forums/forum-details.jsp
+++ b/source/web/jsp/forums/forum-details.jsp
@@ -64,38 +64,37 @@
                      <%-- 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">
                               <img src="<%=request.getContextPath()%>/images/icons/details_large.gif" width=32 height=32>
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{SpaceDetailsBean.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.details_of}" /> '<h:outputText value="#{SpaceDetailsBean.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.location}" />: <r:nodePath value="#{SpaceDetailsBean.space.nodeRef}" breadcrumb="true" actionListener="#{BrowseBean.clickSpacePath}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.forum_details_description}" /></div>
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=100 style="padding-left:2px">
-                              <%-- Current object actions --%>
-                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" /><br>
-                              
-                              <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
-                                 <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" padding="4" actionListener="#{ClipboardBean.cutNode}">
+                           
+                           <td align=right width=80>
+                              <a:menu id="actionsMenu" itemSpacing="4" label="#{msg.actions}" image="/images/icons/menu.gif"
+                                    menuStyleClass="moreActionsMenu" style="white-space:nowrap">
+                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
+                                    <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" actionListener="#{ClipboardBean.cutNode}">
+                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                                 <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" actionListener="#{ClipboardBean.copyNode}">
                                     <f:param name="id" value="#{SpaceDetailsBean.id}" />
                                  </a:actionLink>
-                              </r:permissionEvaluator>
-                              <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" padding="4" actionListener="#{ClipboardBean.copyNode}">
-                                 <f:param name="id" value="#{SpaceDetailsBean.id}" />
-                              </a:actionLink>
-                              <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
-                                 <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" padding="4" action="dialog:deleteSpace" actionListener="#{BrowseBean.setupSpaceAction}">
-                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
-                                 </a:actionLink>
-                              </r:permissionEvaluator>
+                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
+                                    <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" action="dialog:deleteSpace" actionListener="#{BrowseBean.setupSpaceAction}">
+                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                              </a:menu>
                            </td>
                            
                            <%-- Navigation --%>
-                           <td bgcolor="#465F7D" width=1></td>
+                           <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">
diff --git a/source/web/jsp/forums/forum.jsp b/source/web/jsp/forums/forum.jsp
index 3386b500d0..14bdb9ef49 100644
--- a/source/web/jsp/forums/forum.jsp
+++ b/source/web/jsp/forums/forum.jsp
@@ -63,7 +63,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>
  
                            <%-- actions for topics --%>
                            <a:panel id="forum-actions">
@@ -72,27 +72,29 @@
                               </td>
                               <td>
                                  <%-- Summary --%>
-                                 <div class="mainSubTitle"><h:outputText value="#{msg.forum}" id="msg1" /></div>
                                  <div class="mainTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" id="msg2" /></div>
                                  <div class="mainSubText"><h:outputText value="#{msg.forum_info}" id="msg3" /></div>
                               </td>
-                              <td bgcolor="#465F7D" width=1></td>
-                              <td width=110 style="padding-left:2px">
-                                 <%-- Current object actions --%>
-                                 <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" id="msg5" /><br>
-                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval1">
-                                    <a:actionLink value="#{msg.create_topic}" image="/images/icons/create_topic.gif" padding="4" action="dialog:createTopic" actionListener="#{CreateTopicDialog.startWizard}" id="link1" />
-                                 </r:permissionEvaluator>
-                                 <a:actionLink value="#{msg.view_details}" image="/images/icons/View_details.gif" padding="4" action="dialog:showForumDetails" actionListener="#{BrowseBean.setupSpaceAction}" id="link2">
-                                    <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param1" />
-                                 </a:actionLink>
-                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Delete" id="eval2">
-                                    <a:actionLink value="#{msg.delete_forum}" image="/images/icons/delete_forum.gif" padding="4" action="dialog:deleteForum" actionListener="#{BrowseBean.setupDeleteAction}" id="link3">
-                                       <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param2" />
+                              
+                              <td align=right>
+                                 <%-- Create actions menu --%>
+                                 <a:menu id="createMenu" itemSpacing="4" label="#{msg.create_options}" image="/images/icons/menu.gif" menuStyleClass="moreActionsMenu" style="white-space:nowrap">
+                                    <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval1">
+                                       <a:actionLink value="#{msg.create_topic}" image="/images/icons/create_topic.gif" action="dialog:createTopic" actionListener="#{CreateTopicDialog.startWizard}" id="link1" />
+                                    </r:permissionEvaluator>
+                                 </a:menu>
+                              </td>
+                              <td style="padding-left:4px" width=80>
+                                 <%-- More actions menu --%>
+                                 <a:menu id="actionsMenu" itemSpacing="4" label="#{msg.more_actions}" image="/images/icons/menu.gif" menuStyleClass="moreActionsMenu" style="white-space:nowrap">
+                                    <a:actionLink value="#{msg.view_details}" image="/images/icons/View_details.gif" action="dialog:showForumDetails" actionListener="#{BrowseBean.setupSpaceAction}" id="link2">
+                                       <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param1" />
                                     </a:actionLink>
-                                 </r:permissionEvaluator>
-                                 <%-- Current space More actions menu --%>
-                                 <a:menu id="spaceMenu" itemSpacing="4" label="#{msg.more_options}" image="/images/icons/more.gif" tooltip="#{msg.more_options_space}" menuStyleClass="moreActionsMenu" style="padding-left:20px">
+                                    <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Delete" id="eval2">
+                                       <a:actionLink value="#{msg.delete_forum}" image="/images/icons/delete_forum.gif" action="dialog:deleteForum" actionListener="#{BrowseBean.setupDeleteAction}" id="link3">
+                                          <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param2" />
+                                       </a:actionLink>
+                                    </r:permissionEvaluator>
                                     <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Delete" id="eval3">
                                        <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" actionListener="#{ClipboardBean.cutNode}" id="link4">
                                           <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param3" />
@@ -112,13 +114,12 @@
                                  </a:menu>
                               </td>
                            </a:panel>
-                                                      
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=110>
+                           
+                           <td class="separator" width=1></td>
+                           <td width=110 valign=middle>
                               <%-- View mode settings --%>
-                              <h:outputText style="padding-left:26px" styleClass="mainSubTitle" value="#{msg.view}"/><br>
                               <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" selectedImage="/images/icons/Details.gif"
-                                    value="#{ForumsBean.forumViewMode}" actionListener="#{ForumsBean.forumViewModeChanged}">
+                                    value="#{ForumsBean.forumViewMode}" actionListener="#{ForumsBean.forumViewModeChanged}" menu="true" menuImage="/images/icons/menu.gif" styleClass="moreActionsMenu">
                                  <a:listItem value="details" label="#{msg.details_view}" />
                               </a:modeList>
                            </td>
diff --git a/source/web/jsp/forums/forums-details.jsp b/source/web/jsp/forums/forums-details.jsp
index f61cc13d0e..6ea8ce0547 100644
--- a/source/web/jsp/forums/forums-details.jsp
+++ b/source/web/jsp/forums/forums-details.jsp
@@ -64,38 +64,37 @@
                      <%-- 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">
                               <img src="<%=request.getContextPath()%>/images/icons/details_large.gif" width=32 height=32>
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{SpaceDetailsBean.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.details_of}" /> '<h:outputText value="#{SpaceDetailsBean.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.location}" />: <r:nodePath value="#{SpaceDetailsBean.space.nodeRef}" breadcrumb="true" actionListener="#{BrowseBean.clickSpacePath}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.forums_details_description}" /></div>
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=100 style="padding-left:2px">
-                              <%-- Current object actions --%>
-                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" /><br>
-                              
-                              <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
-                                 <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" padding="4" actionListener="#{ClipboardBean.cutNode}">
+                           
+                           <td align=right width=80>
+                              <a:menu id="actionsMenu" itemSpacing="4" label="#{msg.actions}" image="/images/icons/menu.gif"
+                                    menuStyleClass="moreActionsMenu" style="white-space:nowrap">
+                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
+                                    <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" actionListener="#{ClipboardBean.cutNode}">
+                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                                 <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" actionListener="#{ClipboardBean.copyNode}">
                                     <f:param name="id" value="#{SpaceDetailsBean.id}" />
                                  </a:actionLink>
-                              </r:permissionEvaluator>
-                              <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" padding="4" actionListener="#{ClipboardBean.copyNode}">
-                                 <f:param name="id" value="#{SpaceDetailsBean.id}" />
-                              </a:actionLink>
-                              <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
-                                 <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" padding="4" action="dialog:deleteSpace" actionListener="#{BrowseBean.setupSpaceAction}">
-                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
-                                 </a:actionLink>
-                              </r:permissionEvaluator>
+                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
+                                    <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" action="dialog:deleteSpace" actionListener="#{BrowseBean.setupSpaceAction}">
+                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                              </a:menu>
                            </td>
                            
                            <%-- Navigation --%>
-                           <td bgcolor="#465F7D" width=1></td>
+                           <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">
diff --git a/source/web/jsp/forums/forums.jsp b/source/web/jsp/forums/forums.jsp
index f023ac085a..8c677a3388 100644
--- a/source/web/jsp/forums/forums.jsp
+++ b/source/web/jsp/forums/forums.jsp
@@ -63,7 +63,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>
  
                            <%-- actions for forums --%>
                            <a:panel id="forums-actions">
@@ -72,26 +72,28 @@
                               </td>
                               <td>
                                  <%-- Summary --%>
-                                 <div class="mainSubTitle"><h:outputText value="#{msg.forums}" id="msg1" /></div>
                                  <div class="mainTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" id="msg2" /></div>
                                  <div class="mainSubText"><h:outputText value="#{msg.forums_info}" id="msg3" /></div>
                                  <div class="mainSubText"><h:outputText value="#{NavigationBean.nodeProperties.description}" id="msg4" /></div>
                               </td>
-                              <td bgcolor="#465F7D" width=1></td>
-                              <td width=130 style="padding-left:2px">
-                                 <%-- Current object actions --%>
-                                 <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" id="msg5" /><br>
-                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval1">
-                                    <a:actionLink value="#{msg.create_forums}" image="/images/icons/create_forums.gif" padding="4" action="dialog:createForums" actionListener="#{CreateForumsDialog.startWizard}" id="link1" />
-                                 </r:permissionEvaluator>
-                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval2">
-                                    <a:actionLink value="#{msg.create_forum}" image="/images/icons/create_forum.gif" padding="4" action="dialog:createForum" actionListener="#{CreateForumDialog.startWizard}" id="link2" />
-                                 </r:permissionEvaluator>
-                                 <a:actionLink value="#{msg.view_details}" image="/images/icons/View_details.gif" padding="4" action="dialog:showForumsDetails" actionListener="#{BrowseBean.setupSpaceAction}" id="link3">
-                                    <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param1" />
-                                 </a:actionLink>
-                                 <%-- Current space More actions menu --%>
-                                 <a:menu id="spaceMenu" itemSpacing="4" label="#{msg.more_options}" image="/images/icons/more.gif" tooltip="#{msg.more_options_space}" menuStyleClass="moreActionsMenu" style="padding-left:20px">
+                              
+                              <td style="padding-left:4px" width=52>
+                                 <%-- Create actions menu --%>
+                                 <a:menu id="createMenu" itemSpacing="4" label="#{msg.create_options}" image="/images/icons/menu.gif" menuStyleClass="moreActionsMenu" style="white-space:nowrap">
+                                    <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval1">
+                                       <a:actionLink value="#{msg.create_forums}" image="/images/icons/create_forums.gif" action="dialog:createForums" actionListener="#{CreateForumsDialog.startWizard}" id="link1" />
+                                    </r:permissionEvaluator>
+                                    <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval2">
+                                       <a:actionLink value="#{msg.create_forum}" image="/images/icons/create_forum.gif" action="dialog:createForum" actionListener="#{CreateForumDialog.startWizard}" id="link2" />
+                                    </r:permissionEvaluator>
+                                 </a:menu>
+                              </td>
+                              <td style="padding-left:4px" width=80>
+                                 <%-- More actions menu --%>
+                                 <a:menu id="actionsMenu" itemSpacing="4" label="#{msg.more_actions}" image="/images/icons/menu.gif" menuStyleClass="moreActionsMenu" style="white-space:nowrap">
+                                    <a:actionLink value="#{msg.view_details}" image="/images/icons/View_details.gif" action="dialog:showForumsDetails" actionListener="#{BrowseBean.setupSpaceAction}" id="link3">
+                                       <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param1" />
+                                    </a:actionLink>
                                     <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Delete" id="eval3">
                                        <a:actionLink value="#{msg.delete_forums}" image="/images/icons/delete_forums.gif" action="dialog:deleteForums" actionListener="#{BrowseBean.setupDeleteAction}" id="link4">
                                           <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param2" />
@@ -122,13 +124,12 @@
                                  </a:menu>
                               </td>
                            </a:panel>
-                                                      
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=110>
+                          
+                           <td class="separator" width=1></td>
+                           <td width=110 valign=middle>
                               <%-- View mode settings --%>
-                              <h:outputText style="padding-left:26px" styleClass="mainSubTitle" value="#{msg.view}"/><br>
                               <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" selectedImage="/images/icons/Details.gif"
-                                    value="#{ForumsBean.forumsViewMode}" actionListener="#{ForumsBean.forumsViewModeChanged}">
+                                    value="#{ForumsBean.forumsViewMode}" actionListener="#{ForumsBean.forumsViewModeChanged}" menu="true" menuImage="/images/icons/menu.gif" styleClass="moreActionsMenu">
                                  <a:listItem value="details" label="#{msg.details_view}" />
                                  <a:listItem value="icons" label="#{msg.view_icon}" />
                                  <a:listItem value="list" label="#{msg.view_browse}" />
@@ -151,9 +152,7 @@
                <%-- Details - Forums --%>
                <tr valign=top>
                   <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
-                  <td>
-                     <div style="padding:4px">
-                     
+                  <td style="padding:4px">
                      <a:panel id="forums-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" label="#{msg.browse_forums}">
                      
                      <%-- Forums List --%>
@@ -274,8 +273,6 @@
                      
                      </a:panel>
                      
-                     </div>
-                     
                   </td>
                   <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_6.gif)" width=4></td>
                </tr>
diff --git a/source/web/jsp/forums/topic-details.jsp b/source/web/jsp/forums/topic-details.jsp
index 3766e8cc4f..f87b5e6167 100644
--- a/source/web/jsp/forums/topic-details.jsp
+++ b/source/web/jsp/forums/topic-details.jsp
@@ -64,38 +64,37 @@
                      <%-- 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">
                               <img src="<%=request.getContextPath()%>/images/icons/details_large.gif" width=32 height=32>
                            </td>
                            <td>
-                              <div class="mainSubTitle"><h:outputText value="#{SpaceDetailsBean.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.details_of}" /> '<h:outputText value="#{SpaceDetailsBean.name}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.location}" />: <r:nodePath value="#{SpaceDetailsBean.space.nodeRef}" breadcrumb="true" actionListener="#{BrowseBean.clickSpacePath}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.topic_details_description}" /></div>
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=100 style="padding-left:2px">
-                              <%-- Current object actions --%>
-                              <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" /><br>
-                              
-                              <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
-                                 <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" padding="4" actionListener="#{ClipboardBean.cutNode}">
+                           
+                           <td align=right width=80>
+                              <a:menu id="actionsMenu" itemSpacing="4" label="#{msg.actions}" image="/images/icons/menu.gif"
+                                    menuStyleClass="moreActionsMenu" style="white-space:nowrap">
+                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
+                                    <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" actionListener="#{ClipboardBean.cutNode}">
+                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                                 <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" actionListener="#{ClipboardBean.copyNode}">
                                     <f:param name="id" value="#{SpaceDetailsBean.id}" />
                                  </a:actionLink>
-                              </r:permissionEvaluator>
-                              <a:actionLink value="#{msg.copy}" image="/images/icons/copy.gif" padding="4" actionListener="#{ClipboardBean.copyNode}">
-                                 <f:param name="id" value="#{SpaceDetailsBean.id}" />
-                              </a:actionLink>
-                              <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
-                                 <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" padding="4" action="dialog:deleteTopic" actionListener="#{BrowseBean.setupSpaceAction}">
-                                    <f:param name="id" value="#{SpaceDetailsBean.id}" />
-                                 </a:actionLink>
-                              </r:permissionEvaluator>
+                                 <r:permissionEvaluator value="#{SpaceDetailsBean.space}" allow="Delete">
+                                    <a:actionLink value="#{msg.delete}" image="/images/icons/delete.gif" action="dialog:deleteTopic" actionListener="#{BrowseBean.setupSpaceAction}">
+                                       <f:param name="id" value="#{SpaceDetailsBean.id}" />
+                                    </a:actionLink>
+                                 </r:permissionEvaluator>
+                              </a:menu>
                            </td>
                            
                            <%-- Navigation --%>
-                           <td bgcolor="#465F7D" width=1></td>
+                           <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">
diff --git a/source/web/jsp/forums/topic.jsp b/source/web/jsp/forums/topic.jsp
index be7dee05ca..b413e30a5d 100644
--- a/source/web/jsp/forums/topic.jsp
+++ b/source/web/jsp/forums/topic.jsp
@@ -63,7 +63,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>
  
                            <%-- actions for forums --%>
                            <a:panel id="topic-actions">
@@ -72,27 +72,29 @@
                               </td>
                               <td>
                                  <%-- Summary --%>
-                                 <div class="mainSubTitle"><h:outputText value="#{msg.topic}" id="msg1" /></div>
                                  <div class="mainTitle"><h:outputText value="#{NavigationBean.nodeProperties.name}" id="msg2" /></div>
                                  <div class="mainSubText"><h:outputText value="#{msg.topic_info}" id="msg3" /></div>
                               </td>
-                              <td bgcolor="#465F7D" width=1></td>
-                              <td width=110 style="padding-left:2px">
-                                 <%-- Current object actions --%>
-                                 <h:outputText style="padding-left:20px" styleClass="mainSubTitle" value="#{msg.actions}" id="msg5" /><br>
-                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval1">
-                                    <a:actionLink value="#{msg.post_to_topic}" image="/images/icons/create_post.gif" padding="4" action="dialog:createPost" actionListener="#{CreatePostDialog.startWizard}" id="link1" />
-                                 </r:permissionEvaluator>
-                                 <a:actionLink value="#{msg.view_details}" image="/images/icons/View_details.gif" padding="4" action="dialog:showTopicDetails" actionListener="#{BrowseBean.setupSpaceAction}" id="link2">
-                                    <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param1" />
-                                 </a:actionLink>
-                                 <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Delete" id="eval2">
-                                    <a:actionLink value="#{msg.delete_topic}" image="/images/icons/delete_topic.gif" padding="4" action="dialog:deleteTopic" actionListener="#{BrowseBean.setupDeleteAction}" id="link3">
-                                       <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param2" />
+                              
+                              <td align=right>
+                                 <%-- Create actions menu --%>
+                                 <a:menu id="createMenu" itemSpacing="4" label="#{msg.create_options}" image="/images/icons/menu.gif" menuStyleClass="moreActionsMenu" style="white-space:nowrap">
+                                    <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="CreateChildren" id="eval1">
+                                       <a:actionLink value="#{msg.post_to_topic}" image="/images/icons/create_post.gif" action="dialog:createPost" actionListener="#{CreatePostDialog.startWizard}" id="link1" />
+                                    </r:permissionEvaluator>
+                                 </a:menu>
+                              </td>
+                              <td style="padding-left:4px" width=80>
+                                 <%-- More actions menu --%>
+                                 <a:menu id="actionsMenu" itemSpacing="4" label="#{msg.more_actions}" image="/images/icons/menu.gif" menuStyleClass="moreActionsMenu" style="white-space:nowrap">
+                                    <a:actionLink value="#{msg.view_details}" image="/images/icons/View_details.gif" action="dialog:showTopicDetails" actionListener="#{BrowseBean.setupSpaceAction}" id="link2">
+                                       <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param1" />
                                     </a:actionLink>
-                                 </r:permissionEvaluator>
-                                 <%-- Current space More actions menu --%>
-                                 <a:menu id="spaceMenu" itemSpacing="4" label="#{msg.more_options}" image="/images/icons/more.gif" tooltip="#{msg.more_options_space}" menuStyleClass="moreActionsMenu" style="padding-left:20px">
+                                    <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Delete" id="eval2">
+                                       <a:actionLink value="#{msg.delete_topic}" image="/images/icons/delete_topic.gif" action="dialog:deleteTopic" actionListener="#{BrowseBean.setupDeleteAction}" id="link3">
+                                          <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param2" />
+                                       </a:actionLink>
+                                    </r:permissionEvaluator>
                                     <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="Delete" id="eval3">
                                        <a:actionLink value="#{msg.cut}" image="/images/icons/cut.gif" actionListener="#{ClipboardBean.cutNode}" id="link4">
                                           <f:param name="id" value="#{NavigationBean.currentNodeId}" id="param3" />
@@ -112,13 +114,12 @@
                                  </a:menu>
                               </td>
                            </a:panel>
-                                                      
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=110>
+                           
+                           <td class="separator" width=1></td>
+                           <td width=110 valign=middle>
                               <%-- View mode settings --%>
-                              <h:outputText style="padding-left:26px" styleClass="mainSubTitle" value="#{msg.view}"/><br>
                               <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" selectedImage="/images/icons/Details.gif"
-                                    value="#{ForumsBean.topicViewMode}" actionListener="#{ForumsBean.topicViewModeChanged}">
+                                    value="#{ForumsBean.topicViewMode}" actionListener="#{ForumsBean.topicViewModeChanged}" menu="true" menuImage="/images/icons/menu.gif" styleClass="moreActionsMenu">
                                  <a:listItem value="details" label="#{msg.details_view}" />
                                  <a:listItem value="bubble" label="#{msg.bubble_view}" />
                               </a:modeList>
diff --git a/source/web/jsp/roles/manage-content-users.jsp b/source/web/jsp/roles/manage-content-users.jsp
index 72d559f673..dd2aaec20e 100644
--- a/source/web/jsp/roles/manage-content-users.jsp
+++ b/source/web/jsp/roles/manage-content-users.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="#{msg.manage_content_users}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.manage_content_users}" /> '<h:outputText value='#{BrowseBean.document.name}' />'</div>
                               <div class="mainSubText">
                                  <h:outputFormat value="#{msg.content_owner}" rendered="#{ContentUsersBean.owner != null}">
                                     <f:param value="#{ContentUsersBean.owner}" />
@@ -78,19 +77,18 @@
                               </div>
                               <div class="mainSubText"><h:outputText value="#{msg.manage_content_users_description}" /></div>
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=100 style="padding-left:2px">
+                           
+                           <td align=right>
                               <%-- Current object actions --%>
-                              <h:outputText style="padding-left:20px;" styleClass="mainSubTitle" value="#{msg.actions}" /><br/>
                               <r:permissionEvaluator value="#{BrowseBean.document}" allow="ChangePermissions">
                                  <a:actionLink value="#{msg.invite}" image="/images/icons/invite.gif" padding="4" action="inviteUsers" actionListener="#{InviteContentUsersWizard.startWizard}" />
                               </r:permissionEvaluator>
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=100 style="padding-left:2px">
+                           
+                           <td class="separator" width=1></td>
+                           <td width=100 valign=middle>
                               <%-- View mode settings --%>
-                              <h:outputText style="padding-left:26px" styleClass="mainSubTitle" value="#{msg.view}"/><br>
-                              <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" selectedImage="/images/icons/Details.gif" value="0">
+                              <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" selectedImage="/images/icons/Details.gif" value="0" menu="true" menuImage="/images/icons/menu.gif" styleClass="moreActionsMenu">
                                  <a:listItem value="0" label="#{msg.user_details}" />
                               </a:modeList>
                            </td>
diff --git a/source/web/jsp/roles/manage-invited-users.jsp b/source/web/jsp/roles/manage-invited-users.jsp
index 2190bbdd5a..c5426b19f4 100644
--- a/source/web/jsp/roles/manage-invited-users.jsp
+++ b/source/web/jsp/roles/manage-invited-users.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="#{msg.manage_invited_users}" /></div>
+                              <div class="mainTitle"><h:outputText value="#{msg.manage_invited_users}" /> '<h:outputText value='#{BrowseBean.actionSpace.name}' />'</div>
                               <div class="mainSubText">
                                  <h:outputFormat value="#{msg.space_owner}" rendered="#{SpaceUsersBean.owner != null}">
                                     <f:param value="#{SpaceUsersBean.owner}" />
@@ -78,19 +77,18 @@
                               </div>
                               <div class="mainSubText"><h:outputText value="#{msg.manage_invited_users_description}" /></div>
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=100 style="padding-left:2px">
+                           
+                           <td align=right>
                               <%-- Current object actions --%>
-                              <h:outputText style="padding-left:20px;" styleClass="mainSubTitle" value="#{msg.actions}" /><br/>
                               <r:permissionEvaluator value="#{NavigationBean.currentNode}" allow="ChangePermissions">
                                  <a:actionLink value="#{msg.invite}" image="/images/icons/invite.gif" padding="4" action="inviteUsers" actionListener="#{InviteSpaceUsersWizard.startWizard}" />
                               </r:permissionEvaluator>
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=100 style="padding-left:2px">
+                           
+                           <td class="separator" width=1></td>
+                           <td width=100 valign=middle>
                               <%-- View mode settings --%>
-                              <h:outputText style="padding-left:26px" styleClass="mainSubTitle" value="#{msg.view}"/><br>
-                              <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" selectedImage="/images/icons/Details.gif" value="0">
+                              <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" selectedImage="/images/icons/Details.gif" value="0" menu="true" menuImage="/images/icons/menu.gif" styleClass="moreActionsMenu">
                                  <a:listItem value="0" label="#{msg.user_details}" />
                               </a:modeList>
                            </td>
diff --git a/source/web/jsp/users/delete-user.jsp b/source/web/jsp/users/delete-user.jsp
index 10471fc164..b4cdf4ca4d 100644
--- a/source/web/jsp/users/delete-user.jsp
+++ b/source/web/jsp/users/delete-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="#{NavigationBean.nodeProperties.name}" /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.delete_user}" /> '<h:outputText value="#{UsersBean.person.properties.userName}" />'</div>
                               <div class="mainSubText"><h:outputText value="#{msg.delete_user_info}" /></div>
                            </td>
diff --git a/source/web/jsp/users/users.jsp b/source/web/jsp/users/users.jsp
index eca8caecda..875eb30e9b 100644
--- a/source/web/jsp/users/users.jsp
+++ b/source/web/jsp/users/users.jsp
@@ -87,26 +87,25 @@
                      <%-- 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='#{NavigationBean.nodeProperties.name}' /></div>
                               <div class="mainTitle"><h:outputText value="#{msg.manage_users}" /></div>
                               <div class="mainSubText"><h:outputText value="#{msg.manageusers_description}" /></div>
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=100 style="padding-left:2px">
+                           
+                           <td align=right>
                               <%-- Current object actions --%>
-                              <h:outputText style="padding-left:20px;" styleClass="mainSubTitle" value="#{msg.actions}" /><br/>
                               <a:actionLink value="#{msg.create_user}" image="/images/icons/create_user.gif" padding="4" rendered="#{LoginBean.alfrescoAuth}" action="createUser" actionListener="#{NewUserWizard.startWizard}" />
                            </td>
-                           <td bgcolor="#465F7D" width=1></td>
-                           <td width=110 style="padding-left:2px">
+                           
+                           <td class="separator" width=1></td>
+                           <td width=110 valign=middle>
                               <%-- View mode settings --%>
-                              <h:outputText style="padding-left:26px" styleClass="mainSubTitle" value="#{msg.view}"/><br>
-                              <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" selectedImage="/images/icons/Details.gif" value="0">
+                              <a:modeList itemSpacing="3" iconColumnWidth="20" selectedStyleClass="statusListHighlight" selectedImage="/images/icons/Details.gif" value="0"
+                                    menu="true" menuImage="/images/icons/menu.gif" styleClass="moreActionsMenu">
                                  <a:listItem value="0" label="#{msg.user_details}" />
                               </a:modeList>
                            </td>
diff --git a/source/web/jsp/wizard/create-content/create-html.jsp b/source/web/jsp/wizard/create-content/create-html.jsp
index fd47ca5166..8b7e82f0c0 100644
--- a/source/web/jsp/wizard/create-content/create-html.jsp
+++ b/source/web/jsp/wizard/create-content/create-html.jsp
@@ -94,12 +94,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/create-text.jsp b/source/web/jsp/wizard/create-content/create-text.jsp
index 1b27ee524e..564def1d9e 100644
--- a/source/web/jsp/wizard/create-content/create-text.jsp
+++ b/source/web/jsp/wizard/create-content/create-text.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/create-content/select-type.jsp b/source/web/jsp/wizard/create-content/select-type.jsp
index 6c912b2461..b0776acecf 100644
--- a/source/web/jsp/wizard/create-content/select-type.jsp
+++ b/source/web/jsp/wizard/create-content/select-type.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>