diff --git a/config/alfresco/templates/webscripts/org/alfresco/portlets/mytaskspanel.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/portlets/mytaskspanel.get.html.ftl
index 3e7e305510..d0c6138b3c 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/portlets/mytaskspanel.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/portlets/mytaskspanel.get.html.ftl
@@ -51,7 +51,7 @@
          <div class="taskResourceHeader">${t.name?html}:</div>
          <div class="taskResources"></div>
          <div style="float:right;margin-right:48px;margin-top:-48px;">
-            <a class="taskAction" style="padding-top:6px" onclick="event.cancelBubble=true;" href="${url.context}/command/ui/managetask?id=${t.id}&type=${t.qnameType}" target="new"><img src="${url.context}/images/icons/manage_workflow_task.gif" width="16" height="16" border="0" alt="Manage Task Details" title="Manage Task Details"></a>
+            <a class="taskAction" style="padding-top:6px" onclick="event.cancelBubble=true;" href="${url.context}/command/ui/managetask?id=${t.id}&type=${t.qnameType}&container=plain" target="new"><img src="${url.context}/images/icons/manage_workflow_task.gif" width="16" height="16" border="0" alt="Manage Task Details" title="Manage Task Details"></a>
          </div>
          <div>
 	         <table class="taskActions" style="padding-left:16px">
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 3fa5151f7c..483c564c83 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
@@ -47,8 +47,28 @@
                      <#assign formcount=formcount+1>
                      <div class="formsRow">
                         <img src="${url.context}/images/icons/webform_large.gif" width=32 height=32 border=0>
-                        <a class="webformLink" href="${url.context}/command/ui/createwebcontent?sandbox=${sandbox}&webproject=${wp.id}&form=${form.properties["wca:formname"]}&container=plain" target="new">${form.properties.title}</a>
-                        <#--<span>${form.properties.description}</span>-->
+                        <a class="webformLink" href="${url.context}/c/ui/createwebcontent?sandbox=${sandbox}&webproject=${wp.id}&form=${form.properties["wca:formname"]}&container=plain" target="new">${form.properties.title}</a>
+                        <#if form.properties.description?length!=0>
+                        <span style="vertical-align:50%">(${form.properties.description})</span>
+                        </#if>
+                     </div>
+                  </#list>
+               </#if>
+               <#-- Modified Items list -->
+               <#assign moditems = avm.getModifiedItems(storeId, username, "ROOT")>
+               <#if moditems?size != 0>
+                  <div class="itemsTitleRow">My Modified Items</div>
+                  <#list moditems as t>
+                     <div class="formItemRow">
+                        <#if t.isDocument>
+                           <a class="formItemLink" href="${url.context}${t.url}" target="new" title="${t.path?html}"><img class="itemImageIcon" src="${url.context}${t.icon16}" border="0">${t.name?html}</a>
+                        <#else>
+                        <span title="${t.path?html}"><img class="itemImageIcon" src="${url.context}${t.icon16}"><span class="formItemLink">${t.name?html}</span></span>
+                        </#if>
+                        </a>
+                        <#if t.hasAspect("wca:forminstancedata")>
+                        <a class="formActionLink" href="${url.context}/c/ui/editwebcontent?sandbox=${sandbox}&webproject=${wp.id}&path=${t.path?url}&container=plain" target="new"><img class="itemImageIcon" src="${url.context}/images/icons/edit_icon.gif" border="0">Edit</a>
+                        </#if>
                      </div>
                   </#list>
                </#if>
@@ -101,6 +121,14 @@ a.webProjectLink:link, a.webProjectLink:visited, a.webProjectLink:hover
    vertical-align: 60%;
 }
 
+a.formActionLink:link, a.formActionLink:visited, a.formActionLink:hover
+{
+   color: #5A5741;
+   font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+   font-size: 11px;
+   padding-left: 8px;
+}
+
 span.webProjectInfo
 {
    vertical-align: 60%;
@@ -134,6 +162,41 @@ span.webProjectInfo
    border-bottom: 1px dotted #CCD4DB;
 }
 
+.itemsTitleRow
+{
+   background-color: #D8EAF2;
+   border-top: 1px solid #CCD4DB;
+   border-bottom: 1px dotted #CCD4DB;
+   color: #5A5741;
+   font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+   font-size: 13px;
+   font-weight: bold;
+   padding: 4px 0px 4px 48px;
+}
+
+.formItemRow
+{
+   background-color: #D8EAF2;
+   color: #5A5741;
+   font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+   font-size: 13px;
+   padding: 4px 0px 4px 48px;
+}
+
+a.formItemLink:link, a.formItemLink:visited, a.formItemLink:hover
+{
+   color: #5A5741;
+   font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+   font-size: 11px;
+}
+
+span.formItemLink
+{
+   color: #5A5741;
+   font-family: Trebuchet MS, Arial, Helvetica, sans-serif;
+   font-size: 11px;
+}
+
 .formsRow, a.formsRow:link, a.formsRow:visited, a.formsRow:hover
 {
    background-color: #F8FCFD;
@@ -149,6 +212,12 @@ span.webProjectInfo
 {
 }
 
+img.itemImageIcon
+{
+   vertical-align: -25%;
+   padding-right:4px;
+}
+
 span.websiteLink
 {
    padding-left:8px;
diff --git a/source/web/scripts/ajax/myspaces.js b/source/web/scripts/ajax/myspaces.js
index f750a395e2..a9b9379e68 100644
--- a/source/web/scripts/ajax/myspaces.js
+++ b/source/web/scripts/ajax/myspaces.js
@@ -506,9 +506,9 @@ var MySpaces = {
                }
             }, 
             "path=" + path.replace("_%_", "'") +
-            "&name=" + escape(spaceName) +
-            "&title=" + escape(spaceTitle) +
-            "&description=" + escape(spaceDesc)
+            "&name=" + encodeURIComponent(spaceName) +
+            "&title=" + encodeURIComponent(spaceTitle) +
+            "&description=" + encodeURIComponent(spaceDesc)
          );
       }
    },