diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index afcfad51fc..888e6ff5aa 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -210,6 +210,7 @@ title=Title
 author=Author
 date=Date
 mimetype=Format
+modifier=Modifier
 
 # Repo permission display labels
 # Note - these come from the server, the english translation is generally the same
@@ -909,7 +910,7 @@ website_info=Use this view to browse the staging area and user sandboxes for a w
 staging_sandbox=Staging Sandbox
 user_sandboxes=User Sandboxes
 sandbox_preview=Preview Website
-sandbox_create=Create New Content
+sandbox_create=Create Web Content
 sandbox_browse=Browse Website
 sandbox_revert=Undo
 sandbox_revertall=Undo All
diff --git a/source/java/org/alfresco/web/bean/wcm/AVMNode.java b/source/java/org/alfresco/web/bean/wcm/AVMNode.java
index b62f153f2e..59786253e1 100644
--- a/source/java/org/alfresco/web/bean/wcm/AVMNode.java
+++ b/source/java/org/alfresco/web/bean/wcm/AVMNode.java
@@ -199,6 +199,7 @@ public class AVMNode extends Node implements Map<String, Object>
          this.properties.put("created", this.avmRef.getCreateDate());
          this.properties.put("modified", this.avmRef.getModDate());
          this.properties.put("creator", this.avmRef.getCreator());
+         this.properties.put("modifier", this.avmRef.getLastModifier());
          
          this.propsRetrieved = true;
       }
diff --git a/source/java/org/alfresco/web/ui/common/component/UISelectList.java b/source/java/org/alfresco/web/ui/common/component/UISelectList.java
index a9575ba85e..952f533ab3 100644
--- a/source/java/org/alfresco/web/ui/common/component/UISelectList.java
+++ b/source/java/org/alfresco/web/ui/common/component/UISelectList.java
@@ -387,7 +387,7 @@ public class UISelectList extends UIInput implements NamingContainer
       
       // label and description text
       String description = item.getDescription();
-      out.write("<td");
+      out.write("<td width=100%");
       Utils.outputAttribute(out, getAttributes().get("itemStyle"), "style");
       Utils.outputAttribute(out, getAttributes().get("itemStyleClass"), "class");
       out.write("><div style='padding:2px'>");
diff --git a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
index 499a1cbfba..7a13ad4334 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
@@ -743,7 +743,7 @@ public class UIUserSandboxes extends SelfRenderingComponent
             out.write("</td><td>");
             String desc = (String)f.getDescription();
             out.write(desc != null ? desc : "");
-            out.write("</td><td>");
+            out.write("</td><td><nobr>");
             // actions
             UIActionLink action = findAction(ACT_CREATE_FORM_CONTENT, userStorePrefix);
             if (action == null)
@@ -768,7 +768,7 @@ public class UIUserSandboxes extends SelfRenderingComponent
             requestMap.put(REQUEST_FORM_REF, f);
             Utils.encodeRecursive(fc, action);
             requestMap.remove(REQUEST_FORM_REF);
-            out.write("</td></tr>");
+            out.write("</nobr></td></tr>");
          }
          
          out.write("</table>");
diff --git a/source/web/jsp/wcm/browse-sandbox.jsp b/source/web/jsp/wcm/browse-sandbox.jsp
index 4fc5d61f64..a06b1138e4 100644
--- a/source/web/jsp/wcm/browse-sandbox.jsp
+++ b/source/web/jsp/wcm/browse-sandbox.jsp
@@ -141,13 +141,13 @@
                               </a:actionLink>
                            </a:column>
                            
-                           <%-- Description column --%>
+                           <%-- Description column
                            <a:column id="col4" style="text-align:left">
                               <f:facet name="header">
                                  <a:sortLink id="col4-sort" label="#{msg.description}" value="description" styleClass="header"/>
                               </f:facet>
                               <h:outputText id="col4-txt" value="#{r.description}" />
-                           </a:column>
+                           </a:column>--%>
                            
                            <%-- Creator column --%>
                            <a:column id="col5" style="text-align:left">
@@ -160,17 +160,25 @@
                            <%-- Created Date column --%>
                            <a:column id="col6" style="text-align:left">
                               <f:facet name="header">
-                                 <a:sortLink id="col6-sort" label="#{msg.created}" value="created" styleClass="header"/>
+                                 <a:sortLink id="col6-sort" label="#{msg.created_date}" value="created" styleClass="header"/>
                               </f:facet>
                               <h:outputText id="col6-txt" value="#{r.created}">
                                  <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
                               </h:outputText>
                            </a:column>
                            
+                           <%-- Modifier column --%>
+                           <a:column id="col6_1" style="text-align:left">
+                              <f:facet name="header">
+                                 <a:sortLink id="col6_1-sort" label="#{msg.modifier}" value="modifier" styleClass="header"/>
+                              </f:facet>
+                              <h:outputText id="col6_1-txt" value="#{r.modifier}" />
+                           </a:column>
+                           
                            <%-- Modified Date column --%>
                            <a:column id="col7" style="text-align:left">
                               <f:facet name="header">
-                                 <a:sortLink id="col7-sort" label="#{msg.modified}" value="modified" styleClass="header"/>
+                                 <a:sortLink id="col7-sort" label="#{msg.modified_date}" value="modified" styleClass="header"/>
                               </f:facet>
                               <h:outputText id="col7-txt" value="#{r.modified}">
                                  <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
@@ -219,13 +227,13 @@
                               <a:actionLink id="col10-act2" value="#{r.name}" href="#{r.url}" target="new" />
                            </a:column>
                            
-                           <%-- Description column --%>
+                           <%-- Description column
                            <a:column id="col13" style="text-align:left">
                               <f:facet name="header">
                                  <a:sortLink id="col13-sort" label="#{msg.description}" value="description" styleClass="header"/>
                               </f:facet>
                               <h:outputText id="col13-txt" value="#{r.description}" />
-                           </a:column>
+                           </a:column> --%>
                            
                            <%-- Size column --%>
                            <a:column id="col15" style="text-align:left">
@@ -248,17 +256,25 @@
                            <%-- Created Date column --%>
                            <a:column id="col16" style="text-align:left">
                               <f:facet name="header">
-                                 <a:sortLink id="col16-sort" label="#{msg.created}" value="created" styleClass="header"/>
+                                 <a:sortLink id="col16-sort" label="#{msg.created_date}" value="created" styleClass="header"/>
                               </f:facet>
                               <h:outputText id="col16-txt" value="#{r.created}">
                                  <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
                               </h:outputText>
                            </a:column>
                            
+                           <%-- Modifier column --%>
+                           <a:column id="col13" style="text-align:left">
+                              <f:facet name="header">
+                                 <a:sortLink id="col13-sort" label="#{msg.modifier}" value="modifier" styleClass="header"/>
+                              </f:facet>
+                              <h:outputText id="col13-txt" value="#{r.modifier}" />
+                           </a:column>
+                           
                            <%-- Modified Date column --%>
                            <a:column id="col17" style="text-align:left">
                               <f:facet name="header">
-                                 <a:sortLink id="col17-sort" label="#{msg.modified}" value="modified" styleClass="header"/>
+                                 <a:sortLink id="col17-sort" label="#{msg.modified_date}" value="modified" styleClass="header"/>
                               </f:facet>
                               <h:outputText id="col17-txt" value="#{r.modified}">
                                  <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
diff --git a/source/web/jsp/wcm/create-form-wizard/select-default-workflow.jsp b/source/web/jsp/wcm/create-form-wizard/select-default-workflow.jsp
index 2bf5b80b83..4168634fd8 100644
--- a/source/web/jsp/wcm/create-form-wizard/select-default-workflow.jsp
+++ b/source/web/jsp/wcm/create-form-wizard/select-default-workflow.jsp
@@ -43,7 +43,7 @@ function apply_default_workflow_changed(value)
   		value="#{msg.create_form_select_default_workflow_select_workflow}:" 
   		escape="false" />
     <f:verbatim><div id="workflow-list-div"
-  		     style="margin:5px 0px;height:108px;*height:112px;width:100%;overflow:auto" class="selectListTable"></f:verbatim>
+  		     style="margin:5px 0px;height:144px;*height:148px;width:100%;overflow:auto" class="selectListTable"></f:verbatim>
     <a:selectList id="workflow-list" 
   		  multiSelect="false" 
   		  style="width:100%" 
diff --git a/source/web/jsp/wcm/create-website-wizard/form-details.jsp b/source/web/jsp/wcm/create-website-wizard/form-details.jsp
index 34a81514e8..ad94a9c5a2 100644
--- a/source/web/jsp/wcm/create-website-wizard/form-details.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/form-details.jsp
@@ -125,7 +125,7 @@
             </td>
             <td>
                </f:verbatim>
-               <h:inputText id="filepattern" value="#{DialogManager.bean.outputPathPattern}" size="65" maxlength="1024" />
+               <h:inputText id="filepattern" value="#{DialogManager.bean.outputPathPattern}" size="70" maxlength="1024" />
                <h:graphicImage value="/images/icons/Help_icon.gif" style="vertical-align:-20%;padding-left:8px;cursor:help" onclick="javascript:toggleOutputPathPatternHelp()" />
                <f:verbatim>
             </td>
@@ -163,8 +163,8 @@
                </f:verbatim>
                <%-- Workflow selection list - scrollable DIV area --%>
                <h:panelGroup>
-                  <f:verbatim><div style="height:108px;*height:112px;width:300px;overflow:auto" class='selectListTable'></f:verbatim>
-                  <a:selectList id="workflow-list" multiSelect="false" style="width:276px" itemStyleClass="selectListItem"
+                  <f:verbatim><div style="height:144px;*height:148px;width:100%;overflow:auto" class='selectListTable'></f:verbatim>
+                  <a:selectList id="workflow-list" multiSelect="false" style="width:100%" itemStyleClass="selectListItem"
                         value="#{DialogManager.bean.workflowSelectedValue}">
                      <a:listItems value="#{DialogManager.bean.workflowList}" />
                   </a:selectList>
diff --git a/source/web/jsp/wcm/create-website-wizard/form-templates.jsp b/source/web/jsp/wcm/create-website-wizard/form-templates.jsp
index cc559c2e47..ef96f44091 100644
--- a/source/web/jsp/wcm/create-website-wizard/form-templates.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/form-templates.jsp
@@ -49,10 +49,9 @@
             </h:column>
             <h:column>
                <f:facet name="header">
-                  <h:outputText value="#{msg.configure}" />
+                  <h:outputText value="#{msg.output_path_pattern}" />
                </f:facet>
-               <h:outputText value="#{msg.output_path_pattern}:" style="padding-right:4px" />
-               <h:inputText value="#{row.outputPathPattern}" size="65" maxlength="1024" />
+               <h:inputText value="#{row.outputPathPattern}" size="70" maxlength="1024" />
             </h:column>
             <h:column>
                <a:actionLink actionListener="#{DialogManager.bean.removeTemplate}" image="/images/icons/delete.gif"
diff --git a/source/web/jsp/wcm/create-website-wizard/forms.jsp b/source/web/jsp/wcm/create-website-wizard/forms.jsp
index cc150fe8ee..ca912e9f88 100644
--- a/source/web/jsp/wcm/create-website-wizard/forms.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/forms.jsp
@@ -26,8 +26,8 @@
    <%-- Form selection list - scrollable DIV area --%>
    <h:outputText styleClass="mainSubText" value="#{msg.website_select_form}:" />
    <h:panelGroup>
-      <f:verbatim><div style="height:108px;*height:112px;width:300px;overflow:auto" class='selectListTable'></f:verbatim>
-      <a:selectList id="form-list" activeSelect="true" style="width:276px" itemStyleClass="selectListItem">
+      <f:verbatim><div style="height:144px;*height:148px;width:100%;overflow:auto" class='selectListTable'></f:verbatim>
+      <a:selectList id="form-list" activeSelect="true" style="width:100%" itemStyleClass="selectListItem">
          <a:listItems value="#{WizardManager.bean.formsList}" />
          <h:commandButton value="#{msg.add_to_list_button}" styleClass="dialogControls" actionListener="#{WizardManager.bean.addForm}" />
       </a:selectList>
diff --git a/source/web/jsp/wcm/create-website-wizard/settings.jsp b/source/web/jsp/wcm/create-website-wizard/settings.jsp
index 564c7a5137..f701e0e215 100644
--- a/source/web/jsp/wcm/create-website-wizard/settings.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/settings.jsp
@@ -26,8 +26,8 @@
    <%-- Workflow selection list - scrollable DIV area --%>
    <h:outputText styleClass="mainSubText" value="#{msg.website_select_workflows}:" />
    <h:panelGroup>
-      <f:verbatim><div style="height:108px;*height:112px;width:300px;overflow:auto" class='selectListTable'></f:verbatim>
-      <a:selectList id="workflow-list" activeSelect="true" style="width:276px" itemStyleClass="selectListItem">
+      <f:verbatim><div style="height:144px;*height:148px;width:100%;overflow:auto" class='selectListTable'></f:verbatim>
+      <a:selectList id="workflow-list" activeSelect="true" style="width:100%" itemStyleClass="selectListItem">
          <a:listItems value="#{WizardManager.bean.workflowList}" />
          <h:commandButton value="#{msg.add_to_list_button}" styleClass="dialogControls" actionListener="#{WizardManager.bean.addWorkflow}" />
       </a:selectList>