diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index a538619ec1..e7b931f8ea 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -931,6 +931,7 @@ create_form_content=Create Content
 recent_snapshots=Recent Snapshots
 snapshot_revert=Revert
 snapshot_preview=Preview
+webapp_current=Current Webapp Folder
 
 # Website actions and dialog messages
 title_import_content=Import Content into Website
@@ -974,6 +975,9 @@ submit_no_workflow_warning=No suitable workflows could be found for the modified
 submit_submit_info=The following items will be submitted
 submit_items_title=Submit Items
 submit_items_desc=This page helps you to submit modified items for publishing on the website.
+create_webapp=Create Webapp Folder
+create_webapp_title=Create Webapp Folder
+create_webapp_desc=Create a new root Webapp folder for this web project
 
 # New User Wizard messages
 new_user_title=New User Wizard
diff --git a/config/alfresco/web-client-config-dialogs.xml b/config/alfresco/web-client-config-dialogs.xml
index 69d2802cc0..6e06e8a857 100644
--- a/config/alfresco/web-client-config-dialogs.xml
+++ b/config/alfresco/web-client-config-dialogs.xml
@@ -181,6 +181,10 @@
          <dialog name="submitSandboxItems" page="/jsp/wcm/submit-dialog.jsp" managed-bean="SubmitDialog"
                  icon="/images/icons/submit_large.gif" title-id="submit_items_title" 
                  description-id="submit_items_desc" />
+         
+         <dialog name="createWebappFolder" page="/jsp/wcm/create-webapp.jsp" managed-bean="CreateWebappDialog"
+                 icon="/images/icons/create_webapp_large.gif" title-id="create_webapp_title" 
+                 description-id="create_webapp_desc" />
       </dialogs>
    </config>
    
diff --git a/config/alfresco/web-client-config-wcm-actions.xml b/config/alfresco/web-client-config-wcm-actions.xml
index 3de257fa48..027e8fc1a3 100644
--- a/config/alfresco/web-client-config-wcm-actions.xml
+++ b/config/alfresco/web-client-config-wcm-actions.xml
@@ -135,6 +135,16 @@
             <action>dialog:createAvmFolder</action>
          </action>
          
+         <!-- Create AVM webapp folder -->
+         <action id="create_webapp">
+            <permissions>
+               <permission allow="true">CreateChildren</permission>
+            </permissions>
+            <label-id>create_webapp</label-id>
+            <image>/images/icons/create_webapp.gif</image>
+            <action>dialog:createWebappFolder</action>
+         </action>
+         
          <!-- Upload Content -->
          <action id="add_content">
             <permissions>
@@ -206,7 +216,7 @@
          <!-- Edit Web Project wizard -->
          <action id="edit_website">
             <permissions>
-               <permission allow="true">Write</permission>
+               <permission allow="true">Write,CreateChildren</permission>
             </permissions>
             <label-id>edit_website</label-id>
             <image>/images/icons/edit_website.gif</image>
@@ -308,6 +318,7 @@
          <!-- Actions Menu for More Actions in Web Project screen -->
          <action-group id="browse_website_menu">
             <action idref="details_space" />
+            <action idref="create_webapp" />
             <action idref="edit_website" />
             <action idref="invite_website_users" />
             <action idref="delete_space" />
diff --git a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
index 0eac6ba7cc..bb61ea7a74 100644
--- a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
+++ b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
@@ -29,6 +29,7 @@ import java.util.ResourceBundle;
 import javax.faces.application.FacesMessage;
 import javax.faces.context.FacesContext;
 import javax.faces.event.ActionEvent;
+import javax.faces.model.SelectItem;
 import javax.transaction.UserTransaction;
 
 import org.alfresco.model.WCMAppModel;
@@ -110,11 +111,22 @@ public class AVMBrowseBean implements IContextListener
    /** Snapshot date filter selection */
    private String snapshotDateFilter = UISandboxSnapshots.FILTER_DATE_TODAY;
    
+   /** Current sandbox store context for actions and sandbox view */
    private String sandbox;
+   
+   /** Current username context for actions and sandbox view */
    private String username;
+   
+   /** Current webapp context for actions and sandbox view */
+   private String webapp;
+   
+   /** Sandbox title message */
    private String sandboxTitle = null;
+   
+   /** Current AVM path and node representing the current path */
    private String currentPath = null;
    private AVMNode currentPathNode = null;
+   
    private boolean submitAll = false;
    
    /* component references */
@@ -419,6 +431,41 @@ public class AVMBrowseBean implements IContextListener
       this.username = username;
    }
    
+   /**
+    * @return current webapp context
+    */
+   public String getWebapp()
+   {
+      if (this.webapp == null)
+      {
+         this.webapp = (String)getWebsite().getProperties().get(WCMAppModel.PROP_DEFAULTWEBAPP);
+      }
+      return this.webapp;
+   }
+
+   /**
+    * @param webapp  Webapp folder context
+    */
+   public void setWebapp(String webapp)
+   {
+      this.webapp = webapp;
+   }
+   
+   /**
+    * @return list of available root webapp folders for this Web project
+    */
+   public List<SelectItem> getWebapps()
+   {
+      String path = AVMConstants.buildAVMStoreRootPath(getStagingStore());
+      Map<String, AVMNodeDescriptor> folders = this.avmService.getDirectoryListing(-1, path);
+      List<SelectItem> webapps = new ArrayList<SelectItem>(folders.size());
+      for (AVMNodeDescriptor node : folders.values())
+      {
+         webapps.add(new SelectItem(node.getName(), node.getName()));
+      }
+      return webapps;
+   }
+
    /**
     * @return Returns the sandboxTitle.
     */
@@ -511,8 +558,7 @@ public class AVMBrowseBean implements IContextListener
    {
       if (this.currentPath == null)
       {
-         String webapp = (String)getWebsite().getProperties().get(WCMAppModel.PROP_DEFAULTWEBAPP);
-         this.currentPath = AVMConstants.buildAVMStoreWebappPath(getSandbox(), webapp);
+         this.currentPath = AVMConstants.buildAVMStoreWebappPath(getSandbox(), getWebapp());
       }
       return this.currentPath;
    }
diff --git a/source/java/org/alfresco/web/bean/wcm/CreateFolderDialog.java b/source/java/org/alfresco/web/bean/wcm/CreateFolderDialog.java
index da549a834c..b47877da46 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateFolderDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateFolderDialog.java
@@ -42,8 +42,8 @@ public class CreateFolderDialog extends BaseDialogBean
    protected AVMService avmService;
    protected AVMBrowseBean avmBrowseBean;
    
-   private String name;
-   private String description;
+   protected String name;
+   protected String description;
    
    
    /**
diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
index 955a1d76e2..5a9d394294 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
@@ -354,7 +354,7 @@ public class CreateWebContentWizard extends BaseContentWizard
          
          List<AVMDifference> diffs = new ArrayList<AVMDifference>(8);
          // construct diffs for selected items for submission
-         String webapp = (String)website.getProperties().get(WCMAppModel.PROP_DEFAULTWEBAPP);
+         String webapp = this.avmBrowseBean.getWebapp();
          String sandboxPath = AVMConstants.buildAVMStoreRootPath(this.avmBrowseBean.getSandbox());
          if (form)
          {
diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebappDialog.java b/source/java/org/alfresco/web/bean/wcm/CreateWebappDialog.java
new file mode 100644
index 0000000000..014f811db6
--- /dev/null
+++ b/source/java/org/alfresco/web/bean/wcm/CreateWebappDialog.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2005 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
+ */
+package org.alfresco.web.bean.wcm;
+
+import javax.faces.context.FacesContext;
+
+import org.alfresco.model.ApplicationModel;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.avm.AVMNodeConverter;
+import org.alfresco.service.cmr.repository.NodeRef;
+
+/**
+ * Bean implementation for the AVM "Create Webapp Folder" dialog.
+ * 
+ * @author Kevin Roast
+ */
+public class CreateWebappDialog extends CreateFolderDialog
+{
+   // ------------------------------------------------------------------------------
+   // Dialog implementation
+   
+   /**
+    * @see org.alfresco.web.bean.dialog.BaseDialogBean#finishImpl(javax.faces.context.FacesContext, java.lang.String)
+    */
+   @Override
+   protected String finishImpl(FacesContext context, String outcome) throws Exception
+   {
+      String parent = AVMConstants.buildAVMStoreRootPath(this.avmBrowseBean.getStagingStore());
+      this.avmService.createDirectory(parent, this.name);
+      
+      String path = parent + '/' + this.name;
+      NodeRef nodeRef = AVMNodeConverter.ToNodeRef(-1, path);
+      this.nodeService.addAspect(nodeRef, ApplicationModel.ASPECT_UIFACETS, null);
+      if (this.description != null && this.description.length() != 0)
+      {
+         this.nodeService.setProperty(nodeRef, ContentModel.PROP_DESCRIPTION, this.description);
+      }
+      
+      return outcome;
+   }
+}
diff --git a/source/java/org/alfresco/web/bean/wcm/EditWebsiteWizard.java b/source/java/org/alfresco/web/bean/wcm/EditWebsiteWizard.java
index 1b418262ab..2bca48c840 100644
--- a/source/java/org/alfresco/web/bean/wcm/EditWebsiteWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/EditWebsiteWizard.java
@@ -177,7 +177,19 @@ public class EditWebsiteWizard extends CreateWebsiteWizard
       // can be used to apply the modified and previous settings from scratch
       clearWebProjectModel(nodeRef);
       
-      // TODO: add the ability to change/rename the root webapp and DNS name for the website
+      // change/create the root webapp name for the website
+      if (this.webapp != null && this.webapp.length() != 0)
+      {
+         String stagingStore = AVMConstants.buildAVMStagingStoreName(this.dnsName);
+         String webappPath = AVMConstants.buildAVMStoreWebappPath(stagingStore, this.webapp);
+         if (this.avmService.lookup(-1, webappPath) == null)
+         {
+            this.avmService.createDirectory(AVMConstants.buildAVMStoreRootPath(stagingStore), this.webapp);
+         }
+         this.nodeService.setProperty(nodeRef, WCMAppModel.PROP_DEFAULTWEBAPP, this.webapp);
+      }
+      
+      // TODO: allow change of dns name - via store rename functionality
       
       // persist the forms, templates, workflows and workflow defaults to the model for this web project
       saveWebProjectModel(nodeRef);
diff --git a/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java b/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java
index e42213d9e4..4f31369618 100644
--- a/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java
@@ -79,6 +79,7 @@ public class ImportWebsiteDialog
    protected FileFolderService fileFolderService;
    protected ContentService contentService;
    protected NavigationBean navigationBean;
+   protected AVMBrowseBean avmBrowseBean;
    protected AVMService avmService;
    protected NodeService nodeService;
    
@@ -107,6 +108,14 @@ public class ImportWebsiteDialog
       this.navigationBean = navigationBean;
    }
    
+   /**
+    * @param avmBrowseBean       The AVMBrowseBean to set.
+    */
+   public void setAvmBrowseBean(AVMBrowseBean avmBrowseBean)
+   {
+      this.avmBrowseBean = avmBrowseBean;
+   }
+
    /**
     * @param avmService          The AVMService to set.
     */
@@ -203,7 +212,7 @@ public class ImportWebsiteDialog
             // import the content into the appropriate store for the website
             Node website = this.navigationBean.getCurrentNode();
             String storeRoot = (String)website.getProperties().get(WCMAppModel.PROP_AVMSTORE);
-            String webapp = (String)website.getProperties().get(WCMAppModel.PROP_DEFAULTWEBAPP);
+            String webapp = this.avmBrowseBean.getWebapp();
             if (storeRoot != null && webapp != null)
             {
                String store = AVMConstants.buildAVMStagingStoreName(storeRoot);
diff --git a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
index bafa873690..44045f36b4 100644
--- a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
@@ -427,9 +427,10 @@ public class SubmitDialog extends BaseDialogBean
       List<AVMNodeDescriptor> selected;
       if (this.avmBrowseBean.getSubmitAll())
       {
-         String userStore = this.avmBrowseBean.getSandbox() + ":/";
-         String stagingStore = this.avmBrowseBean.getStagingStore() + ":/";
-         List<AVMDifference> diffs = avmSyncService.compare(-1, userStore, -1, stagingStore, nameMatcher);
+         String webapp = this.avmBrowseBean.getWebapp();
+         String userStore = AVMConstants.buildAVMStoreWebappPath(this.avmBrowseBean.getSandbox(), webapp);
+         String stagingStore = AVMConstants.buildAVMStoreWebappPath(this.avmBrowseBean.getStagingStore(), webapp);
+         List<AVMDifference> diffs = this.avmSyncService.compare(-1, userStore, -1, stagingStore, nameMatcher);
          selected = new ArrayList<AVMNodeDescriptor>(diffs.size());
          for (AVMDifference diff : diffs)
          {
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 5924e3f33f..cd740c07ba 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
@@ -130,6 +130,9 @@ public class UIUserSandboxes extends SelfRenderingComponent
    /** website to show sandboxes for */
    private NodeRef value;
    
+   /** webapp to filter list by */
+   private String webapp;
+   
    /** cached converter instance */
    private ByteSizeConverter sizeConverter = null;
    
@@ -472,28 +475,29 @@ public class UIUserSandboxes extends SelfRenderingComponent
       DateFormat df = Utils.getDateTimeFormat(fc);
       ResourceBundle bundle = Application.getBundle(fc);
       
-      // build the paths to the stores to compare
-      String userStorePrefix = AVMConstants.buildAVMUserMainStoreName(storeRoot, username);
-      String userStore = userStorePrefix + ":/";
-      String stagingStore = AVMConstants.buildAVMStagingStoreName(storeRoot) + ":/";
+      // build the paths to the stores to compare - filter by current webapp
+      String userStore = AVMConstants.buildAVMUserMainStoreName(storeRoot, username);
+      String userStorePath = AVMConstants.buildAVMStoreWebappPath(userStore, getWebapp());
+      String stagingStore = AVMConstants.buildAVMStagingStoreName(storeRoot);
+      String stagingStorePath = AVMConstants.buildAVMStoreWebappPath(stagingStore, getWebapp());
       
       // info we need to calculate preview paths for assets
-      String dns = AVMConstants.lookupStoreDNS(userStorePrefix);
-      int rootPathIndex = AVMConstants.buildAVMStoreRootPath(userStorePrefix).length();
+      String dns = AVMConstants.lookupStoreDNS(userStore);
+      int rootPathIndex = AVMConstants.buildAVMStoreRootPath(userStore).length();
       ClientConfigElement config = Application.getClientConfig(fc);
       
       // get the UIActions component responsible for rendering context related user actions
       // TODO: we may need a component per user instance? (or use evaluators for roles...)
-      UIActions uiFileActions = aquireUIActions(ACTIONS_FILE, userStorePrefix);
-      UIActions uiFolderActions = aquireUIActions(ACTIONS_FOLDER, userStorePrefix);
-      UIActions uiDeletedActions = aquireUIActions(ACTIONS_DELETED, userStorePrefix);
+      UIActions uiFileActions = aquireUIActions(ACTIONS_FILE, userStore);
+      UIActions uiFolderActions = aquireUIActions(ACTIONS_FOLDER, userStore);
+      UIActions uiDeletedActions = aquireUIActions(ACTIONS_DELETED, userStore);
       
       String id = getClientId(fc);
       
       // use the sync service to get the list of diffs between the stores
       NameMatcher matcher = (NameMatcher)FacesContextUtils.getRequiredWebApplicationContext(fc).getBean(
             "globalPathExcluder");
-      List<AVMDifference> diffs = avmSyncService.compare(-1, userStore, -1, stagingStore, matcher);
+      List<AVMDifference> diffs = avmSyncService.compare(-1, userStorePath, -1, stagingStorePath, matcher);
       if (diffs.size() != 0)
       {
          // store lookup of username to list of modified nodes
@@ -665,11 +669,11 @@ public class UIUserSandboxes extends SelfRenderingComponent
          out.write(bundle.getString(MSG_SELECTED));
          out.write(":&nbsp;");
          Utils.encodeRecursive(fc, aquireAction(
-               fc, userStorePrefix, username, ACT_SANDBOX_SUBMITSELECTED, "/images/icons/submit_all.gif",
+               fc, userStore, username, ACT_SANDBOX_SUBMITSELECTED, "/images/icons/submit_all.gif",
                "#{AVMBrowseBean.setupSandboxAction}", "dialog:submitSandboxItems"));
          out.write("&nbsp;");
          Utils.encodeRecursive(fc, aquireAction(
-               fc, userStorePrefix, username, ACT_SANDBOX_REVERTSELECTED, "/images/icons/revert_all.gif",
+               fc, userStore, username, ACT_SANDBOX_REVERTSELECTED, "/images/icons/revert_all.gif",
                "#{AVMBrowseBean.revertSelected}", null));
          out.write("</td></tr>");
          
@@ -1023,6 +1027,28 @@ public class UIUserSandboxes extends SelfRenderingComponent
       this.value = value;
    }
    
+   /**
+    * @return Returns the webapp to filter file list by
+    */
+   public String getWebapp()
+   {
+      ValueBinding vb = getValueBinding("webapp");
+      if (vb != null)
+      {
+         this.webapp = (String)vb.getValue(getFacesContext());
+      }
+      
+      return this.webapp;
+   }
+
+   /**
+    * @param webapp  The webapp to filter file list by
+    */
+   public void setWebapp(String webapp)
+   {
+      this.webapp = webapp;
+   }
+
    /**
     * Get the selected nodes for a specified sandbox user
     * 
diff --git a/source/java/org/alfresco/web/ui/wcm/tag/UserSandboxesTag.java b/source/java/org/alfresco/web/ui/wcm/tag/UserSandboxesTag.java
index 271f1f1376..34ff7de1d2 100644
--- a/source/java/org/alfresco/web/ui/wcm/tag/UserSandboxesTag.java
+++ b/source/java/org/alfresco/web/ui/wcm/tag/UserSandboxesTag.java
@@ -49,6 +49,7 @@ public class UserSandboxesTag extends BaseComponentTag
       super.setProperties(component);
       
       setStringProperty(component, "value", this.value);
+      setStringProperty(component, "webapp", this.webapp);
    }
    
    /**
@@ -58,6 +59,7 @@ public class UserSandboxesTag extends BaseComponentTag
    {
       super.release();
       this.value = null;
+      this.webapp = null;
    }
    
    /**
@@ -70,6 +72,20 @@ public class UserSandboxesTag extends BaseComponentTag
       this.value = value;
    }
    
+   /**
+    * Set the webapp
+    *
+    * @param webapp     the webapp
+    */
+   public void setWebapp(String webapp)
+   {
+      this.webapp = webapp;
+   }
+
+
+   /** the webapp */
+   private String webapp;
+   
    /** the value (root store name to display sandboxes for) */
    private String value;
 }
diff --git a/source/web/WEB-INF/faces-config-beans.xml b/source/web/WEB-INF/faces-config-beans.xml
index 12e516c0d7..a2f2fc3cf7 100644
--- a/source/web/WEB-INF/faces-config-beans.xml
+++ b/source/web/WEB-INF/faces-config-beans.xml
@@ -2235,6 +2235,10 @@
          <property-name>avmService</property-name>
          <value>#{AVMService}</value>
       </managed-property>
+      <managed-property>
+         <property-name>avmBrowseBean</property-name>
+         <value>#{AVMBrowseBean}</value>
+      </managed-property>
    </managed-bean>
    
    <managed-bean>
@@ -2471,6 +2475,27 @@
       </managed-property>
    </managed-bean>
    
+   <managed-bean>
+      <description>
+         The bean that backs up the Create AVM Webapp Folder Dialog
+      </description>
+      <managed-bean-name>CreateWebappDialog</managed-bean-name>
+      <managed-bean-class>org.alfresco.web.bean.wcm.CreateWebappDialog</managed-bean-class>
+      <managed-bean-scope>session</managed-bean-scope>
+      <managed-property>
+         <property-name>avmService</property-name>
+         <value>#{AVMService}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>avmBrowseBean</property-name>
+         <value>#{AVMBrowseBean}</value>
+      </managed-property>
+      <managed-property>
+         <property-name>nodeService</property-name>
+         <value>#{NodeService}</value>
+      </managed-property>
+   </managed-bean>
+   
    <managed-bean>
       <description>
          The bean that backs up the AVM Add Content Dialog
diff --git a/source/web/WEB-INF/wcm.tld b/source/web/WEB-INF/wcm.tld
index e9278bb122..adb5067b44 100644
--- a/source/web/WEB-INF/wcm.tld
+++ b/source/web/WEB-INF/wcm.tld
@@ -42,6 +42,12 @@
          <required>false</required>
          <rtexprvalue>true</rtexprvalue>
       </attribute>
+      
+      <attribute>
+         <name>webapp</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
    </tag>
    
    <tag>
diff --git a/source/web/images/icons/create_webapp.gif b/source/web/images/icons/create_webapp.gif
new file mode 100644
index 0000000000..acb4beac34
Binary files /dev/null and b/source/web/images/icons/create_webapp.gif differ
diff --git a/source/web/images/icons/create_webapp_large.gif b/source/web/images/icons/create_webapp_large.gif
new file mode 100644
index 0000000000..60dfc1d99a
Binary files /dev/null and b/source/web/images/icons/create_webapp_large.gif differ
diff --git a/source/web/jsp/wcm/browse-sandbox.jsp b/source/web/jsp/wcm/browse-sandbox.jsp
index 15c9a9d9e4..5ea7034afa 100644
--- a/source/web/jsp/wcm/browse-sandbox.jsp
+++ b/source/web/jsp/wcm/browse-sandbox.jsp
@@ -77,20 +77,20 @@
                            <td align=right>
                               <a:actionLink value="#{msg.sandbox_preview}" image="/images/icons/preview_website.gif" href="#{AVMBrowseBean.sandboxPreviewUrl}" target="new" />
                            </td>
-                           <td style="padding-left:4px" width=52>
-                              <%-- Create actions menu --%>
-                              <r:permissionEvaluator value="#{AVMBrowseBean.currentPathNode}" allow="CreateChildren" id="eval1">
-                                 <a:menu id="createMenu" itemSpacing="4" label="#{msg.create_options}" image="/images/icons/menu.gif" menuStyleClass="moreActionsMenu" style="white-space:nowrap">
-                                    <r:actions id="acts_create" value="avm_create_menu" context="#{AVMBrowseBean.currentPathNode}" />
-                                 </a:menu>
-                              </r:permissionEvaluator>
-                           </td>
+                           <r:permissionEvaluator value="#{AVMBrowseBean.currentPathNode}" allow="CreateChildren" id="eval1">
                            <td style="padding-left:4px" width=80>
-                              <%-- More actions menu --%>
+                              <%-- 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:actions id="acts_create" value="avm_create_menu" context="#{AVMBrowseBean.currentPathNode}" />
+                              </a:menu>
+                           </td>
+                           </r:permissionEvaluator>
+                           <%-- More actions menu --%>
+                           <%-- <td style="padding-left:4px" width=80>
                               <a:menu id="actionsMenu" itemSpacing="4" label="#{msg.more_actions}" image="/images/icons/menu.gif" menuStyleClass="moreActionsMenu" style="white-space:nowrap">
                                  <r:actions id="acts_more" value="avm_more_menu" context="#{AVMBrowseBean.currentPathNode}" />
                               </a:menu>
-                           </td>
+                           </td>--%>
                         </tr>
                      </table>
                      
diff --git a/source/web/jsp/wcm/browse-website.jsp b/source/web/jsp/wcm/browse-website.jsp
index c8bdff2897..28eda57489 100644
--- a/source/web/jsp/wcm/browse-website.jsp
+++ b/source/web/jsp/wcm/browse-website.jsp
@@ -31,7 +31,7 @@
    <%-- load a bundle of properties with I18N strings --%>
    <f:loadBundle basename="alfresco.messages.webclient" var="msg"/>
    
-   <h:form acceptCharset="UTF-8" id="browse-website">
+   <h:form acceptCharset="UTF-8" id="website">
    
    <%-- Main outer table --%>
    <table cellspacing=0 cellpadding=2>
@@ -83,7 +83,7 @@
                               </nobr>
                            </td>
                            <a:panel id="import-panel" rendered="#{AVMBrowseBean.isManagerRole}">
-                           <td align=right width=170>
+                           <td align=right width=160>
                               <nobr>
                               <%-- Import website content action --%>
                               <a:actionLink value="#{msg.import_website_content}" image="/images/icons/import_website.gif" padding="2" action="dialog:importContent" actionListener="#{ImportWebsiteDialog.start}" />
@@ -108,57 +108,65 @@
                <tr valign=top>
                   <td style="background-image: url(<%=request.getContextPath()%>/images/parts/whitepanel_4.gif)" width=4></td>
                   <td style="padding:4px">
+                     <%-- Current Webapp selection --%>
+                     <h:outputText value="#{msg.webapp_current}" styleClass="mainSubTitle" />:&nbsp;
+                     <h:selectOneMenu value="#{AVMBrowseBean.webapp}" onchange="document.forms['website'].submit(); return true;">
+                        <f:selectItems value="#{AVMBrowseBean.webapps}" />
+                     </h:selectOneMenu>
+                     
+                     <div style="padding:4px"></div>
+                     
                      <a:panel id="staging-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" label="#{msg.staging_sandbox}">
                         
                         <%-- Staging Sandbox Info --%>
                         <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
-                           <table cellspacing=2 cellpadding=2 border=0 width=100%>
-                              <tr>
-                                 <td align=left width=32><a:actionLink image="/images/icons/sandbox_large.gif" showLink="false" value="#{msg.staging_sandbox}" actionListener="#{AVMBrowseBean.setupSandboxAction}" action="browseSandbox" /></td>
-                                 <td align=left><h:outputText value="#{msg.staging_sandbox}" styleClass="mainSubTitle" /></td>
-                                 <td align=right>
-                                    <a:actionLink id="actPreview" value="#{msg.sandbox_preview}" image="/images/icons/preview_website.gif" showLink="false" href="#{AVMBrowseBean.stagingPreviewUrl}" target="new" />
-                                    <a:actionLink id="actSnap" value="#{msg.sandbox_snapshot}" image="/images/icons/create_snapshot.gif" showLink="false" actionListener="#{AVMBrowseBean.setupSandboxAction}" action="dialog:snapshotSandbox" />
-                                    <a:actionLink id="actBrowse" value="#{msg.sandbox_browse}" image="/images/icons/space_small.gif" showLink="false" actionListener="#{AVMBrowseBean.setupSandboxAction}" action="browseSandbox" />
-                                 </td>
-                              </tr>
-                              <tr>
-                                 <td></td>
-                                 <td colspan=2>
-                                    <div style='line-height:6px'>
-                                       <h:outputText value="#{AVMBrowseBean.stagingSummary}" escape="false" />
-                                    </div>
-                                 </td>
-                              </tr>
-                              <tr>
-                                 <td></td>
-                                 <td colspan=2>
-                                    <a:panel id="snapshots-panel" rendered="#{AVMBrowseBean.isManagerRole}" label="#{msg.recent_snapshots}"
-                                          progressive="true" expanded="false" styleClass="mainSubTitle">
-                                    <div style='padding-left:16px;padding-top:8px;padding-bottom:4px'>
-                                       <%-- Sandbox snapshots list --%>
-                                       <table cellspacing=2 cellpadding=0 width=100% class="snapshotItemsList">
-                                          <tr>
-                                             <td><img src="<%=request.getContextPath()%>/images/icons/filter.gif" width=16 height=16></td>
-                                             <td style="padding-left:8px;width:120px"><nobr><h:outputText id="msg-date" value="#{msg.date_filter_when}" />:</nobr></td>
-                                             <td width=100%>
-                                                <a:modeList id="snap-filter" itemSpacing="2" iconColumnWidth="0" horizontal="true" selectedLinkStyle="font-weight:bold"
-                                                      value="#{AVMBrowseBean.snapshotDateFilter}" actionListener="#{AVMBrowseBean.snapshotDateFilterChanged}">
-                                                   <a:listItem id="f1" value="all" label="#{msg.date_filter_all}" />
-                                                   <a:listItem id="f2" value="today" label="#{msg.date_filter_today}" />
-                                                   <a:listItem id="f3" value="week" label="#{msg.date_filter_week}" />
-                                                   <a:listItem id="f4" value="month" label="#{msg.date_filter_month}" />
-                                                </a:modeList>
-                                             </td>
-                                          </tr>
-                                       </table>
-                                       <div style='padding:2px'></div>
-                                       <w:sandboxSnapshots id="snapshots" value="#{AVMBrowseBean.stagingStore}" dateFilter="#{AVMBrowseBean.snapshotDateFilter}" />
-                                    </div>
-                                    </a:panel>
-                                 </td>
-                              </tr>
-                           </table>
+                        <table cellspacing=2 cellpadding=2 border=0 width=100%>
+                           <tr>
+                              <td align=left width=32><a:actionLink image="/images/icons/sandbox_large.gif" showLink="false" value="#{msg.staging_sandbox}" actionListener="#{AVMBrowseBean.setupSandboxAction}" action="browseSandbox" /></td>
+                              <td align=left><h:outputText value="#{msg.staging_sandbox}" styleClass="mainSubTitle" /></td>
+                              <td align=right>
+                                 <a:actionLink id="actPreview" value="#{msg.sandbox_preview}" image="/images/icons/preview_website.gif" showLink="false" href="#{AVMBrowseBean.stagingPreviewUrl}" target="new" />
+                                 <a:actionLink id="actSnap" value="#{msg.sandbox_snapshot}" image="/images/icons/create_snapshot.gif" showLink="false" actionListener="#{AVMBrowseBean.setupSandboxAction}" action="dialog:snapshotSandbox" />
+                                 <a:actionLink id="actBrowse" value="#{msg.sandbox_browse}" image="/images/icons/space_small.gif" showLink="false" actionListener="#{AVMBrowseBean.setupSandboxAction}" action="browseSandbox" />
+                              </td>
+                           </tr>
+                           <tr>
+                              <td></td>
+                              <td colspan=2>
+                                 <div style='line-height:6px'>
+                                    <h:outputText value="#{AVMBrowseBean.stagingSummary}" escape="false" />
+                                 </div>
+                              </td>
+                           </tr>
+                           <tr>
+                              <td></td>
+                              <td colspan=2>
+                                 <a:panel id="snapshots-panel" rendered="#{AVMBrowseBean.isManagerRole}" label="#{msg.recent_snapshots}"
+                                       progressive="true" expanded="false" styleClass="mainSubTitle">
+                                 <div style='padding-left:16px;padding-top:8px;padding-bottom:4px'>
+                                    <%-- Sandbox snapshots list --%>
+                                    <table cellspacing=2 cellpadding=0 width=100% class="snapshotItemsList">
+                                       <tr>
+                                          <td><img src="<%=request.getContextPath()%>/images/icons/filter.gif" width=16 height=16></td>
+                                          <td style="padding-left:8px;width:120px"><nobr><h:outputText id="msg-date" value="#{msg.date_filter_when}" />:</nobr></td>
+                                          <td width=100%>
+                                             <a:modeList id="snap-filter" itemSpacing="2" iconColumnWidth="0" horizontal="true" selectedLinkStyle="font-weight:bold"
+                                                   value="#{AVMBrowseBean.snapshotDateFilter}" actionListener="#{AVMBrowseBean.snapshotDateFilterChanged}">
+                                                <a:listItem id="f1" value="all" label="#{msg.date_filter_all}" />
+                                                <a:listItem id="f2" value="today" label="#{msg.date_filter_today}" />
+                                                <a:listItem id="f3" value="week" label="#{msg.date_filter_week}" />
+                                                <a:listItem id="f4" value="month" label="#{msg.date_filter_month}" />
+                                             </a:modeList>
+                                          </td>
+                                       </tr>
+                                    </table>
+                                    <div style='padding:2px'></div>
+                                    <w:sandboxSnapshots id="snapshots" value="#{AVMBrowseBean.stagingStore}" dateFilter="#{AVMBrowseBean.snapshotDateFilter}" />
+                                 </div>
+                                 </a:panel>
+                              </td>
+                           </tr>
+                        </table>
                         <% PanelGenerator.generatePanelEnd(out, request.getContextPath(), "blue"); %>
                         
                      </a:panel>
@@ -175,7 +183,7 @@
                      <a:panel id="sandboxes-panel" border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle" label="#{msg.user_sandboxes}">
                         
                         <%-- User Sandboxes List --%>
-                        <w:userSandboxes id="sandboxes" binding="#{AVMBrowseBean.userSandboxes}" value="#{NavigationBean.currentNode.nodeRef}" />
+                        <w:userSandboxes id="sandboxes" binding="#{AVMBrowseBean.userSandboxes}" value="#{NavigationBean.currentNode.nodeRef}" webapp="#{AVMBrowseBean.webapp}" />
                         
                      </a:panel>
                      
diff --git a/source/web/jsp/wcm/create-webapp.jsp b/source/web/jsp/wcm/create-webapp.jsp
new file mode 100644
index 0000000000..c4d736aee4
--- /dev/null
+++ b/source/web/jsp/wcm/create-webapp.jsp
@@ -0,0 +1,106 @@
+<%--
+  Copyright (C) 2005 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<f:verbatim>
+<script type="text/javascript" src="<%=request.getContextPath()%>/scripts/validation.js"> </script>
+
+<script type="text/javascript">
+   var finishButtonPressed = false;
+   window.onload = pageLoaded;
+   
+   function pageLoaded()
+   {
+      document.getElementById("dialog:dialog-body:name").focus();
+      document.getElementById("dialog").onsubmit = validate;
+      document.getElementById("dialog:finish-button").onclick = function() {finishButtonPressed = true; clear_dialog();}
+      checkButtonState();
+   }
+   
+   function checkButtonState()
+   {
+      if (document.getElementById("dialog:dialog-body:name").value.length == 0 )
+      {
+         document.getElementById("dialog:finish-button").disabled = true;
+      }
+      else
+      {
+         document.getElementById("dialog:finish-button").disabled = false;
+      }
+   }
+   
+   function validate()
+   {
+      if (finishButtonPressed)
+      {
+         finishButtonPressed = false;
+         return validateName(document.getElementById("dialog:dialog-body:name"), 
+                             '</f:verbatim><a:outputText value="#{msg.validation_invalid_character}" /><f:verbatim>',
+                             true);
+      }
+      else
+      {
+         return true;
+      }
+   }
+
+</script>
+
+<table cellpadding="2" cellspacing="2" border="0" width="100%">
+   <tr>
+      <td colspan="3" class="wizardSectionHeading">
+         </f:verbatim>
+      	<h:outputText value="#{msg.properties}" />
+         <f:verbatim>
+      </td>
+   </tr>
+   <tr>
+      <td align="middle">
+         </f:verbatim>
+         <h:graphicImage value="/images/icons/required_field.gif" alt="Required Field" />
+         <f:verbatim>
+      </td>
+      <td>
+         </f:verbatim>
+      	<h:outputText value="#{msg.name}:" />
+         <f:verbatim>
+      </td>
+      <td width="85%">
+         </f:verbatim>
+         <h:inputText id="name" value="#{DialogManager.bean.name}" size="35" maxlength="1024" 
+                      onkeyup="javascript:checkButtonState();" onchange="javascript:checkButtonState();" />
+         <f:verbatim>
+      </td>
+   </tr>
+   <tr>
+      <td></td>
+      <td>
+         </f:verbatim>
+      	<h:outputText value="#{msg.description}:" />
+         <f:verbatim>
+      </td>
+      <td>
+         </f:verbatim>
+         <h:inputText id="description" value="#{DialogManager.bean.description}" size="35" maxlength="1024" />
+         <f:verbatim>
+      </td>
+   </tr>
+</table>
+</f:verbatim>
diff --git a/source/web/jsp/wcm/create-website-wizard/details.jsp b/source/web/jsp/wcm/create-website-wizard/details.jsp
index c254c915eb..8a7ed4b36f 100644
--- a/source/web/jsp/wcm/create-website-wizard/details.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/details.jsp
@@ -126,8 +126,7 @@
       </td>
       <td width="85%">
          </f:verbatim>
-         <h:inputText id="webapp" value="#{WizardManager.bean.webapp}" size="35" maxlength="256" 
-               disabled="true" /> <%-- disabled="#{WizardManager.bean.editMode}" --%>
+         <h:inputText id="webapp" value="#{WizardManager.bean.webapp}" size="35" maxlength="256" />
          <f:verbatim>
       </td>
    </tr>