diff --git a/config/alfresco/templates/client/myspaces_preview_panel.ftl b/config/alfresco/templates/client/myspaces_preview_panel.ftl
index 6a5ab1a8ce..b27eecaa29 100644
--- a/config/alfresco/templates/client/myspaces_preview_panel.ftl
+++ b/config/alfresco/templates/client/myspaces_preview_panel.ftl
@@ -13,12 +13,17 @@
             <#elseif isImage>
 	            <center><a href="${url.context}${node.url}" target="new"><img src="${url.context}${node.url}?${node.size}" height=140 border=0></a></center>
 	         <#elseif node.isContainer>
-	            <#list node.children?sort_by('name') as c>
-	               <#--if (c_index >= 25)><div>...</div><#break></#if>-->
-	               <#if c.isDocument || c.isContainer>
-	               <div style="padding:2px"><a class="childSpaceLink" href="${url.context}${c.url}" target="new"><img class="spaceImageIcon" src="${url.context}${c.icon16}" border="0">${c.name}</a></div>
-	               </#if>
-	            </#list>
+	            <#assign childs=node.children?sort_by('name')>
+	            <#if childs?size != 0>
+   	            <#list childs as c>
+   	               <#--if (c_index >= 25)><div>...</div><#break></#if>-->
+   	               <#if c.isDocument || c.isContainer>
+   	               <div style="padding:2px"><a class="childSpaceLink" href="${url.context}${c.url}" target="new"><img class="spaceImageIcon" src="${url.context}${c.icon16}" border="0">${c.name}</a></div>
+   	               </#if>
+   	            </#list>
+   	         <#else>
+                  <div style="padding:2px" class="spacesNoItems">No items to display</div>
+               </#if>
       	   </#if>
          </div>
       </td>
@@ -28,7 +33,7 @@
 <#assign navurl='/navigate/showDocDetails/' + node.nodeRef.storeRef.protocol + '/' + node.nodeRef.storeRef.identifier + '/' + node.nodeRef.id>
 <#if node.isDocument>
             <tr>
-<#if node.isLocked >
+<#if node.isLocked>
                <td class="spaceAction docActionCheckout docActionLocked">(Locked)</td>
 <#elseif hasAspect(node, "cm:workingcopy") == 1>
                <td class="spaceAction docActionCheckin" <#if node.hasPermission("CheckIn")>onclick='event.cancelBubble=true;MySpaces.checkinItem("${node.name}", "${node.nodeRef}");'</#if>>Check In</td>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.html.ftl
index 431c8d7b72..3b13dbdda7 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/doclist.get.html.ftl
@@ -70,9 +70,7 @@
          <script>
             MyDocs.ServiceContext="${url.serviceContext}";
             MyDocs.Filter="${filter}";
-            <#if home?exists>
-            MyDocs.Home="${home.nodeRef}";
-            </#if>
+            <#if home?exists>MyDocs.Home="${home.nodeRef}";</#if>
             MyDocs.Query="${query?replace("\"","\\\"")}";
          </script>
       </div>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl
index 92c1c4e803..8382b392e2 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/myspaces.get.html.ftl
@@ -517,6 +517,12 @@ a.childSpaceLink:link, a.childSpaceLink:visited, a.childSpaceLink:hover
    font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
 }
 
+div.spacesNoItems
+{
+   color: #5A5741;
+   font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+}
+
 img.spaceImageIcon
 {
    vertical-align: -25%;
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebfiles.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebfiles.get.html.ftl
index 3cf3550e95..024fe95acd 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebfiles.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebfiles.get.html.ftl
@@ -31,10 +31,10 @@
             <div class="webProjectRow">
                <div class="webProjectTitle">
                   <a class="webPreviewLink" href="${avm.websiteUserSandboxUrl(storeId, username)}" target="new"><img src="${url.context}/images/icons/website_large.gif" width=32 height=32 border=0><span class="websiteLink">${wp.name}</span></a>
-                  <a class="webProjectLink" href="${url.context}${wp.url}" target="new">View Web Project</a>
                   <span class="webProjectInfo" onclick="event.cancelBubble=true; AlfNodeInfoMgr.toggle('${wp.nodeRef}',this);">
                      <img src="${url.context}/images/icons/popup.gif" class="popupImage" width="16" height="16" />
                   </span>
+                  <a class="webProjectLink" href="${url.context}${wp.url}" target="new"><img class="itemImageIcon" src="${url.context}/images/icons/view_web_project.gif" width="16" height="16" border="0">View Web Project</a>
                   <#if wp.properties.description?exists && wp.properties.description?length!=0>
                   <br>
                   <span class="webprojectDesc">${wp.properties.description}</span>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms.get.html.ftl
index eb4f79815d..632b850b54 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/mywebforms.get.html.ftl
@@ -31,10 +31,10 @@
             <div class="webProjectRow">
                <div class="webProjectTitle">
                   <a class="webPreviewLink" href="${avm.websiteUserSandboxUrl(storeId, username)}" target="new"><img src="${url.context}/images/icons/website_large.gif" width=32 height=32 border=0><span class="websiteLink">${wp.name}</span></a>
-                  <a class="webProjectLink" href="${url.context}${wp.url}" target="new">View Web Project</a>
                   <span class="webProjectInfo" onclick="event.cancelBubble=true; AlfNodeInfoMgr.toggle('${wp.nodeRef}',this);">
                      <img src="${url.context}/images/icons/popup.gif" class="popupImage" width="16" height="16" />
                   </span>
+                  <a class="webProjectLink" href="${url.context}${wp.url}" target="new"><img class="itemImageIcon" src="${url.context}/images/icons/view_web_project.gif" width="16" height="16" border="0">View Web Project</a>
                   <#if wp.properties.description?exists && wp.properties.description?length!=0>
                   <br>
                   <span class="webprojectDesc">${wp.properties.description}</span>
@@ -138,6 +138,12 @@ span.webProjectInfo
    padding: 8px;
 }
 
+img.itemImageIcon
+{
+   vertical-align: -25%;
+   padding-right:4px;
+}
+
 .formsRowSeparator
 {
    border-bottom: 1px dotted #CCD4DB;
diff --git a/source/web/images/icons/view_web_project.gif b/source/web/images/icons/view_web_project.gif
new file mode 100644
index 0000000000..051120e2d3
Binary files /dev/null and b/source/web/images/icons/view_web_project.gif differ
diff --git a/source/web/scripts/ajax/doclist.js b/source/web/scripts/ajax/doclist.js
index 2cb2450f27..b424c73120 100644
--- a/source/web/scripts/ajax/doclist.js
+++ b/source/web/scripts/ajax/doclist.js
@@ -23,7 +23,7 @@ var MyDocs = {
          // is responsible for rendering just the contents of the main panel div
          YAHOO.util.Connect.asyncRequest(
             "GET",
-            MyDocs.ServiceContext + '/ui/doclistpanel?f='+MyDocs.Filter+'&h='+MyDocs.Home+'&q='+MyDocs.Query,
+            MyDocs.ServiceContext + '/ui/doclistpanel?f=' + MyDocs.Filter + '&q=' + MyDocs.Query + (MyDocs.Home != null ? '&h=' + MyDocs.Home : ''),
             {
                success: function(response)
                {