diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index e6b95ef85d..f32199da40 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -800,6 +800,7 @@ user_sandboxes=User Sandboxes
 sandbox_preview=Preview Website
 sandbox_create=Create New Content
 sandbox_browse=Browse Website
+sandbox_icon=Browse Website
 import_website_content=Import Website Content
 title_browse_sandbox=Browse Sandbox
 sandbox_info=Use this view to browse the files and folders within the sandbox for a website.
diff --git a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
index 606aed0e5d..8c3a0d2e2c 100644
--- a/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
+++ b/source/java/org/alfresco/web/bean/wcm/AVMBrowseBean.java
@@ -320,8 +320,6 @@ public class AVMBrowseBean implements IContextListener
             // build the client representation of the AVM node
             AVMNode node = new AVMNode(avmRef);
             
-            // add any common properties
-            
             // properties specific to folders or files
             if (avmRef.isDirectory())
             {
diff --git a/source/java/org/alfresco/web/bean/wcm/AVMNode.java b/source/java/org/alfresco/web/bean/wcm/AVMNode.java
index d0d94878b6..a4de6c73c2 100644
--- a/source/java/org/alfresco/web/bean/wcm/AVMNode.java
+++ b/source/java/org/alfresco/web/bean/wcm/AVMNode.java
@@ -75,6 +75,7 @@ public class AVMNode implements Map<String, Object>
          
          this.properties.put("id", this.path);
          this.properties.put("path", this.path);
+         this.properties.put("size", this.avmRef.getLength());
          this.properties.put("name", this.avmRef.getName());
          this.properties.put("created", this.avmRef.getCreateDate());
          this.properties.put("modified", this.avmRef.getModDate());
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 d3d6e90e9a..ca9b375aae 100644
--- a/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
+++ b/source/java/org/alfresco/web/ui/wcm/component/UIUserSandboxes.java
@@ -193,7 +193,11 @@ public class UIUserSandboxes extends SelfRenderingComponent
                
                // components for the current username, preview, browse and modified items inner list
                out.write("<table cellspacing=2 cellpadding=2 border=0 width=100%><tr><td>");
-               out.write(Utils.buildImageTag(context, WebResources.IMAGE_USERSANDBOX_32, 32, 32, ""));
+               // show the icon for the sandbox as a clickable browse link image
+               Utils.encodeRecursive(context, aquireAction(
+                     context, mainStore, username, "sandbox_icon", WebResources.IMAGE_USERSANDBOX_32,
+                     "#{AVMBrowseBean.setupSandboxAction}", "browseSandbox"));
+               //out.write(Utils.buildImageTag(context, WebResources.IMAGE_USERSANDBOX_32, 32, 32, ""));
                out.write("</td><td width=100%>");
                out.write("<b>");
                out.write(bundle.getString(MSG_USERNAME));
diff --git a/source/web/jsp/wcm/browse-sandbox.jsp b/source/web/jsp/wcm/browse-sandbox.jsp
index 0f6ab13059..887a1197cf 100644
--- a/source/web/jsp/wcm/browse-sandbox.jsp
+++ b/source/web/jsp/wcm/browse-sandbox.jsp
@@ -106,8 +106,8 @@
                               label="#{msg.website_browse_folders}">
                         
                         <a:richList id="folder-list" binding="#{AVMBrowseBean.foldersRichList}" viewMode="details" pageSize="10"
-                           styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
-                           value="#{AVMBrowseBean.folders}" var="r">
+                              styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
+                              value="#{AVMBrowseBean.folders}" var="r">
                            
                            <%-- Primary column with folder name --%>
                            <a:column primary="true" width="200" style="padding:2px;text-align:left">
@@ -180,8 +180,8 @@
                               label="#{msg.website_browse_files}">
                         
                         <a:richList id="files-list" binding="#{AVMBrowseBean.filesRichList}" viewMode="details" pageSize="10"
-                           styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
-                           value="#{AVMBrowseBean.files}" var="r">
+                              styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" altRowStyleClass="recordSetRowAlt" width="100%"
+                              value="#{AVMBrowseBean.files}" var="r">
                            
                            <%-- Primary column for details view mode --%>
                            <a:column id="col10" primary="true" width="200" style="padding:2px;text-align:left">
diff --git a/source/web/jsp/wcm/browse-website.jsp b/source/web/jsp/wcm/browse-website.jsp
index 7f13977c32..97c49d9521 100644
--- a/source/web/jsp/wcm/browse-website.jsp
+++ b/source/web/jsp/wcm/browse-website.jsp
@@ -102,7 +102,7 @@
                         <% PanelGenerator.generatePanelStart(out, request.getContextPath(), "blue", "#D3E6FE"); %>
                            <table cellspacing=2 cellpadding=2 border=0 width=100%>
                               <tr>
-                                 <td align=left width=32><h:graphicImage url="/images/icons/sandbox_large.gif" width="32" height="32" /></td>
+                                 <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>
                                     (P)&nbsp;(E)&nbsp;(T)&nbsp;(D)&nbsp;
diff --git a/source/web/jsp/wcm/import-content-dialog.jsp b/source/web/jsp/wcm/import-content-dialog.jsp
index cde7321413..c0236f1a46 100644
--- a/source/web/jsp/wcm/import-content-dialog.jsp
+++ b/source/web/jsp/wcm/import-content-dialog.jsp
@@ -144,7 +144,7 @@
                                  <h:form acceptCharset="UTF-8" id="add-content-upload-end">
                                  <% if (foundFile) { %>
                                  <tr>
-                                    <td colspan="3">
+                                    <td>
                                        <table border="0" cellspacing="2" cellpadding="2" class="selectedItems">
                                           <tr>
                                              <td colspan="2" class="selectedItemsHeader">
@@ -163,6 +163,11 @@
                                           </tr>
                                        </table>
                                     </td>
+                                    <td width="100%" valign="middle" align="center">
+                                       <div id="progress" style="display:none">
+                                          <img src="<%=request.getContextPath()%>/images/icons/process_animation.gif" width=174 height=14>
+                                       </div>
+                                    </td>
                                  </tr>
                                  <% } %>
                                  
@@ -177,7 +182,8 @@
                                     <td align="center">
                                        <h:commandButton id="finish-button" styleClass="wizardButton"
                                                         value="#{msg.ok}" 
-                                                        action="#{ImportWebsiteDialog.finish}" 
+                                                        action="#{ImportWebsiteDialog.finish}"
+                                                        onclick="javascript:document.getElementById('progress').style.display='inline';"
                                                         disabled="#{ImportWebsiteDialog.finishButtonDisabled}" />
                                     </td>
                                  </tr>