diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml
index b2eb138f3f..1b28d86534 100644
--- a/config/alfresco/web-client-config.xml
+++ b/config/alfresco/web-client-config.xml
@@ -232,8 +232,10 @@
             <!-- this dashlet 'tasks-todo' is also shown by default for all users -->
             <dashlet id="tasks-todo" label-id="my_tasks_todo_title" description-id="my_tasks_todo_desc"
                   jsp="/jsp/workflow/tasks-todo-dashlet.jsp" allow-narrow="false" />
-            <dashlet id="tasks-active" label-id="tasks_active_title" description-id="tasks_active_desc"
+            <!-- Not enabled by default
+			<dashlet id="tasks-active" label-id="tasks_active_title" description-id="tasks_active_desc"
                   jsp="/jsp/workflow/tasks-active-dashlet.jsp" allow-narrow="false" />
+			-->
             <dashlet id="pooled-tasks" label-id="pooled_tasks_title" description-id="pooled_tasks_desc"
                   jsp="/jsp/workflow/pooled-tasks-todo-dashlet.jsp" allow-narrow="false" />
             <dashlet id="tasks-completed" label-id="my_tasks_completed_title" description-id="my_tasks_completed_desc"
diff --git a/source/java/org/alfresco/web/app/Application.java b/source/java/org/alfresco/web/app/Application.java
index d1f197749a..a532c682a2 100644
--- a/source/java/org/alfresco/web/app/Application.java
+++ b/source/java/org/alfresco/web/app/Application.java
@@ -643,6 +643,11 @@ public class Application
             {
                locale = I18NUtil.parseLocale(strLocale);
             }
+            else
+            {
+               // failing that, use the server default locale
+               locale = Locale.getDefault();
+            }
          }
          else
          {
@@ -689,6 +694,11 @@ public class Application
             {
                locale = I18NUtil.parseLocale(strLocale);
             }
+            else
+            {
+               // failing that, use the server default locale
+               locale = Locale.getDefault();
+            }
          }
          else
          {
diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
index bcea324db3..a82f21b3b3 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
@@ -1234,7 +1234,11 @@ public class CreateWebsiteWizard extends BaseWizardBean
          this.formsDataModel = new ListDataModel();
       }
       
-      this.formsDataModel.setWrappedData(this.forms);
+      // only set the wrapped data once otherwise the row index gets reset
+      if (this.formsDataModel.getWrappedData() == null)
+      {
+         this.formsDataModel.setWrappedData(this.forms);
+      }
       
       return this.formsDataModel;
    }
@@ -1341,7 +1345,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
     */
    public void setupWorkflowAction(ActionEvent event)
    {
-      setActionWorkflow( (WorkflowConfiguration)this.workflowsDataModel.getRowData() );
+      setActionWorkflow( (WorkflowConfiguration)this.getWorkflowsDataModel().getRowData());
    }
    
    /**
@@ -1374,7 +1378,11 @@ public class CreateWebsiteWizard extends BaseWizardBean
          this.workflowsDataModel = new ListDataModel();
       }
       
-      this.workflowsDataModel.setWrappedData(this.workflows);
+      // only set the wrapped data once otherwise the row index gets reset
+      if (this.workflowsDataModel.getWrappedData() == null)
+      {
+         this.workflowsDataModel.setWrappedData(this.workflows);
+      }
       
       return this.workflowsDataModel;
    }
diff --git a/source/java/org/alfresco/web/bean/wcm/ManageReviewTaskDialog.java b/source/java/org/alfresco/web/bean/wcm/ManageReviewTaskDialog.java
index 3a9f89e8ae..607c8742bc 100644
--- a/source/java/org/alfresco/web/bean/wcm/ManageReviewTaskDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/ManageReviewTaskDialog.java
@@ -201,8 +201,17 @@ public class ManageReviewTaskDialog extends ManageTaskDialog
       Map request = context.getExternalContext().getRequestMap();
       if (request.get(AVMBrowseBean.REQUEST_BEEN_DEPLOYED_RESULT) == null)
       {
-         List<NodeRef> testServers = DeploymentUtil.findTestServers(this.webProjectRef, false);
-         result = new Boolean(testServers != null && testServers.size() > 0);
+         result = Boolean.FALSE;
+         
+         if (this.webProjectRef != null)
+         {
+            List<NodeRef> testServers = DeploymentUtil.findTestServers(this.webProjectRef, false);
+            if (testServers != null)
+            {
+               result = new Boolean(testServers != null && testServers.size() > 0);
+            }
+         }
+         
          request.put(AVMBrowseBean.REQUEST_BEEN_DEPLOYED_RESULT, result);
       }
       else
diff --git a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
index c0ecd479cd..8a8d8e823c 100644
--- a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
+++ b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
@@ -2804,6 +2804,10 @@ public class Schema2XForms implements Serializable
                                        typeName);
          }
          final StringList lexicalPatterns = ((XSSimpleTypeDefinition)controlType).getLexicalPattern();
+         for (int i = 0; lexicalPatterns != null && i < lexicalPatterns.getLength(); i++)
+         {
+            constraints.add("chiba:match(., '" + lexicalPatterns.item(i) + "',null)");
+         }
       }
 
       final short constraintType =
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java b/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java
index 339536d960..a37be1b305 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIWorkflowHistory.java
@@ -131,7 +131,7 @@ public class UIWorkflowHistory extends SelfRenderingComponent
          else
          {
             // output surrounding table and style if necessary
-            out.write("<table cellspacing='2' cellpadding='1' border='0' width='100%'");
+            out.write("<table cellspacing='2' cellpadding='1' border='0'");
             if (this.getAttributes().get("style") != null)
             {
                out.write(" style=\"");
diff --git a/source/web/css/main.css b/source/web/css/main.css
index 3ae60e1c2b..350ef268d1 100644
--- a/source/web/css/main.css
+++ b/source/web/css/main.css
@@ -622,10 +622,12 @@ a.topToolbarLinkHighlight, a.topToolbarLinkHighlight:link, a.topToolbarLinkHighl
 {
    margin-left: 18px;
    margin-top: 6px;
+   margin-right: 4px;
    background-color: #f5f5f5;
    border-width: 1px;
    border-style: solid;
    border-color: #DDDDDD;
+   width: auto;
 }
 
 #pluginBox