diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index 56c930502e..e3b0b03182 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -1935,6 +1935,7 @@ error_domain_mismatch=Domain mismatch: expected = {0}, actual = {1}
 
 # Confirmations
 return_to_application=Return to application
+return_home=My Content
 delete_space_info=To remove this space and all of its contents, click OK.
 delete_space_assoc_info=This space appears in multiple locations, to remove the space from the current location, click OK.
 delete_space_confirm=Are you sure you want to delete \"{0}\" and all its contents?
diff --git a/source/java/org/alfresco/web/bean/NavigationBean.java b/source/java/org/alfresco/web/bean/NavigationBean.java
index 7852f0a33b..d5fea94a6c 100644
--- a/source/java/org/alfresco/web/bean/NavigationBean.java
+++ b/source/java/org/alfresco/web/bean/NavigationBean.java
@@ -734,7 +734,15 @@ public class NavigationBean implements Serializable
       
       return this.currentNode;
    }
-
+   
+   /**
+    * @return Boolean value according to CREATE_CHILDREN permission on the current node.
+    */
+   public boolean isCreateChildrenPermissionEnabled()
+   {
+       return getCurrentNode().hasPermission(PermissionService.CREATE_CHILDREN);
+   }
+   
    /**
     * @return Returns the breadcrumb handler elements representing the location path of the UI.
     */
diff --git a/source/java/org/alfresco/web/bean/rules/CreateCompositeRuleWizard.java b/source/java/org/alfresco/web/bean/rules/CreateCompositeRuleWizard.java
index 7b600259c6..e6a138d742 100644
--- a/source/java/org/alfresco/web/bean/rules/CreateCompositeRuleWizard.java
+++ b/source/java/org/alfresco/web/bean/rules/CreateCompositeRuleWizard.java
@@ -196,14 +196,28 @@ public class CreateCompositeRuleWizard extends CreateRuleWizard
    {
       if (isAddingCompositeCondition())
       {
-         //don't clear when editing, since we are looking at a REFERENCE to an existing condition
-         if (this.editingCondition == false) {
+         // don't clear when editing, since we are looking at a REFERENCE to an existing condition
+         if (this.editingCondition == false) 
+         {
             this.currentConditionProperties.clear();
          }
+         
          // reset the action drop down
-         this.selectedCondition = null;         
+         this.selectedCondition = null;
+         
+         // determine what page to go back to
+         FacesContext context = FacesContext.getCurrentInstance();
+         String currentViewId = context.getViewRoot().getViewId();
+         
          IHandler handler = this.conditionHandlers.get(CompositeConditionHandler.NAME);
-         goToPage(FacesContext.getCurrentInstance(), handler.getJSPPath());
+         String compositePage = handler.getJSPPath();
+         
+         if (currentViewId.equals(compositePage))
+         {
+            this.returnViewId = getWizardContainerViewId(context);
+         }
+
+         goToPage(FacesContext.getCurrentInstance(), this.returnViewId);
       } 
       else
       {
diff --git a/source/java/org/alfresco/web/ui/common/component/UIActionLink.java b/source/java/org/alfresco/web/ui/common/component/UIActionLink.java
index 1cf431b64d..fa5713669e 100644
--- a/source/java/org/alfresco/web/ui/common/component/UIActionLink.java
+++ b/source/java/org/alfresco/web/ui/common/component/UIActionLink.java
@@ -74,6 +74,7 @@ public class UIActionLink extends UICommand
       this.tooltip = (String)values[5];
       this.target = (String)values[6];
       this.verticalAlign = (String)values[7];
+      this.onclick = (String)values[8];
    }
    
    /**
@@ -91,7 +92,8 @@ public class UIActionLink extends UICommand
          this.href,
          this.tooltip,
          this.target,
-         this.verticalAlign
+         this.verticalAlign,
+         this.onclick
       };
    }
 
diff --git a/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java
index d34f5ee8c5..cc0be349f3 100644
--- a/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java
+++ b/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java
@@ -349,7 +349,23 @@ public class ActionLinkRenderer extends BaseRenderer
       if (link.getHref() == null)
       {
          out.write("<a href='#' onclick=\"");
-         out.write(Utils.generateFormSubmit(context, link, Utils.getActionHiddenFieldName(context, link), link.getClientId(context), getParameterComponents(link)));
+         
+         // if we have an overriden onclick add that
+         if (link.getOnclick() != null)
+         {
+            out.write(link.getOnclick());
+         }
+         else
+         {
+            // generate JavaScript to set a hidden form field and submit
+            // a form which request attributes that we can decode
+            out.write(Utils.generateFormSubmit(context, 
+                                               link, 
+                                               Utils.getActionHiddenFieldName(context, link), 
+                                               link.getClientId(context), 
+                                               getParameterComponents(link)));
+         }
+         
          out.write('"');
       }
       else
diff --git a/source/java/org/alfresco/web/ui/repo/component/template/UITemplate.java b/source/java/org/alfresco/web/ui/repo/component/template/UITemplate.java
index 349408b1dc..62c1401daf 100644
--- a/source/java/org/alfresco/web/ui/repo/component/template/UITemplate.java
+++ b/source/java/org/alfresco/web/ui/repo/component/template/UITemplate.java
@@ -197,6 +197,8 @@ public class UITemplate extends SelfRenderingComponent
       
       Map root = DefaultModelHelper.buildDefaultModel(services, user, templateRef);
       
+      root.put("url", new URLHelper(fc.getExternalContext().getRequestContextPath()));
+      
       // merge models
       if (model instanceof Map)
       {
@@ -302,4 +304,23 @@ public class UITemplate extends SelfRenderingComponent
          return FileTypeImageUtils.getFileTypeImage(FacesContext.getCurrentInstance(), filename, size);
       }
    };
+
+   
+   /**
+    * URL Helper - to supply ${url.context} value for templates in JSF client
+    */
+   public static class URLHelper
+   {
+      String context;
+
+      public URLHelper(String context)
+      {
+         this.context = context;
+      }
+
+      public String getContext()
+      {
+         return context;
+      }
+   }
 }
diff --git a/source/java/org/alfresco/web/ui/repo/tag/SystemErrorTag.java b/source/java/org/alfresco/web/ui/repo/tag/SystemErrorTag.java
index 9641f19d9a..cf25871f15 100644
--- a/source/java/org/alfresco/web/ui/repo/tag/SystemErrorTag.java
+++ b/source/java/org/alfresco/web/ui/repo/tag/SystemErrorTag.java
@@ -50,6 +50,7 @@ public class SystemErrorTag extends TagSupport
    private static final long serialVersionUID = -7336055169875448199L;
    
    private static final String MSG_RETURN_TO_APP = "return_to_application";
+   private static final String MSG_RETURN_HOME   = "return_home";
    private static final String MSG_HIDE_DETAILS  = "hide_details";
    private static final String MSG_SHOW_DETAILS  = "show_details";
    private static final String MSG_LOGOUT        = "logout";
@@ -267,6 +268,12 @@ public class SystemErrorTag extends TagSupport
          // this can be used by the user if the app has got into a total mess
          if (Application.inPortalServer() == false)
          {
+            out.write("\n<div style='padding-top:16px;'><a href='");
+            out.write(((HttpServletRequest)pageContext.getRequest()).getContextPath());
+            out.write("'>");
+            out.write(bundle.getString(MSG_RETURN_HOME));
+            out.write("</a></div>");
+            
             out.write("\n<div style='padding-top:16px;'><a href='");
             out.write(((HttpServletRequest)pageContext.getRequest()).getContextPath());
             out.write(ExternalAccessServlet.generateExternalURL("logout", null));
diff --git a/source/web/index.jsp b/source/web/index.jsp
index 6bc01731bf..fb07091fe4 100644
--- a/source/web/index.jsp
+++ b/source/web/index.jsp
@@ -114,10 +114,20 @@ else
       try { tx.rollback(); } catch (Throwable tex) {}
    }
 }
-if(request.getMethod().equalsIgnoreCase("GET"))
+
+if (request.getMethod().equalsIgnoreCase("GET"))
 {
    if (NavigationBean.LOCATION_MYALFRESCO.equals(location))
    {
+      // Clear previous location - Fixes the issue ADB-61
+      FacesContext fc = FacesContext.getCurrentInstance();
+      if (fc != null)
+      {
+         NavigationBean navigationBean = (NavigationBean)FacesHelper.getManagedBean(fc, "NavigationBean");
+         navigationBean.setLocation(null);
+         navigationBean.setToolbarLocation(null);
+      }
+      // Send redirect
       response.sendRedirect(request.getContextPath() + "/faces/jsp/dashboards/container.jsp");
    }
    else
@@ -131,4 +141,4 @@ else if (request.getMethod().equalsIgnoreCase("PROPFIND") ||
 {
    response.sendRedirect(request.getContextPath() + "/webdav/");
 }
-%>
+%>
\ No newline at end of file
diff --git a/source/web/jsp/actions/mail.jsp b/source/web/jsp/actions/mail.jsp
index fa26d9d2db..d9843027dd 100644
--- a/source/web/jsp/actions/mail.jsp
+++ b/source/web/jsp/actions/mail.jsp
@@ -289,6 +289,6 @@
 InviteSpaceUsersWizard wizard = (InviteSpaceUsersWizard)FacesHelper.getManagedBean(FacesContext.getCurrentInstance(), "InviteSpaceUsersWizard");
 if (wizard != null) 
 {
-   wizard.init(new HashMap<String, String>());
+   wizard.init(new HashMap());
 }
 %>
diff --git a/source/web/jsp/browse/browse.jsp b/source/web/jsp/browse/browse.jsp
index 676d7e142d..a279055e0c 100644
--- a/source/web/jsp/browse/browse.jsp
+++ b/source/web/jsp/browse/browse.jsp
@@ -139,7 +139,7 @@
                               </td>
                               <td style="padding-left:4px" width=52>
                                  <%-- Create actions menu --%>
-                                 <a:menu id="createMenu" itemSpacing="4" label="#{msg.create_options}" image="/images/icons/menu.gif" menuStyleClass="moreActionsMenu" style="white-space:nowrap">
+                                 <a:menu id="createMenu" itemSpacing="4" label="#{msg.create_options}" image="/images/icons/menu.gif" menuStyleClass="moreActionsMenu" style="white-space:nowrap" rendered="#{NavigationBean.createChildrenPermissionEnabled}">
                                     <r:actions id="acts_create" value="browse_create_menu" context="#{NavigationBean.currentNode}" />
                                  </a:menu>
                               </td>
@@ -238,7 +238,9 @@
                            <a:panel id="page-controls1" style="font-size:9px">
                               <h:outputText value="#{msg.items_per_page}" id="items-txt1"/>
                               <h:inputText id="spaces-pages" value="#{BrowseBean.pageSizeSpacesStr}" style="width:24px;margin-left:4px" maxlength="3" onkeyup="return applySizeSpaces(event);" />
-                              <div style="display:none"><a:actionLink id="spaces-apply" value="" actionListener="#{BrowseBean.updateSpacesPageSize}" /></div>
+                              <f:verbatim><div style="display:none"></f:verbatim>
+                              <a:actionLink id="spaces-apply" value="" actionListener="#{BrowseBean.updateSpacesPageSize}" />
+                              <f:verbatim></div></f:verbatim>
                            </a:panel>
                         </f:facet>
                      </h:panelGroup>
@@ -382,7 +384,9 @@
                            <a:panel id="page-controls2" style="font-size:9px">
                               <h:outputText value="#{msg.items_per_page}" id="items-txt2"/>
                               <h:inputText id="content-pages" value="#{BrowseBean.pageSizeContentStr}" style="width:24px;margin-left:4px" maxlength="3" onkeyup="return applySizeContent(event);" />
-                              <div style="display:none"><a:actionLink id="content-apply" value="" actionListener="#{BrowseBean.updateContentPageSize}" /></div>
+                              <f:verbatim><div style="display:none"></f:verbatim>
+                              <a:actionLink id="content-apply" value="" actionListener="#{BrowseBean.updateContentPageSize}" />
+                              <f:verbatim></div></f:verbatim>
                            </a:panel>
                         </f:facet>
                      </h:panelGroup>
diff --git a/source/web/jsp/login.jsp b/source/web/jsp/login.jsp
index 1e3691bbfa..eb20668a98 100644
--- a/source/web/jsp/login.jsp
+++ b/source/web/jsp/login.jsp
@@ -31,6 +31,7 @@
 <%@ page import="org.alfresco.web.app.servlet.BaseServlet" %>
 <%@ page import="org.alfresco.web.app.servlet.AuthenticationHelper" %>
 <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
+<%@ page import="org.alfresco.web.app.Application" %>
 <%@ page import="javax.faces.context.FacesContext" %>
 <%@ page import="javax.servlet.http.Cookie" %>
 <%@ page import="java.util.Locale" %>