diff --git a/config/alfresco/messages/webclient.properties b/config/alfresco/messages/webclient.properties
index bb8b45192f..4371b70c0a 100644
--- a/config/alfresco/messages/webclient.properties
+++ b/config/alfresco/messages/webclient.properties
@@ -871,6 +871,7 @@ dashlet_btn_select=Add
 dashlet_btn_remove=Remove
 selected_dashlets=Selected Components
 dashboard_column=Column
+column_max_components=this column can display {0} components
 
 # My Alfresco Layouts messages
 layout_single_label=Single Column
diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml
index f4f1690fd2..414d73b66b 100644
--- a/config/alfresco/web-client-config.xml
+++ b/config/alfresco/web-client-config.xml
@@ -169,12 +169,12 @@
             <layout id="default" columns="1" column-length="5" image="/images/icons/layout_single_column.gif"
                   label-id="layout_single_label" description-id="layout_single_desc"
                   jsp="/jsp/dashboards/layouts/single-column.jsp" />
-            <layout id="narrow-left-2column" columns="2" column-length="4" image="/images/icons/layout_narrow_left_2column.gif"
-                  label-id="layout_narrow_left_label" description-id="layout_narrow_left_desc"
-                  jsp="/jsp/dashboards/layouts/narrow-left-2column.jsp" />
             <layout id="narrow-right-2column" columns="2" column-length="4" image="/images/icons/layout_narrow_right_2column.gif"
                   label-id="layout_narrow_right_label" description-id="layout_narrow_right_desc"
                   jsp="/jsp/dashboards/layouts/narrow-right-2column.jsp" />
+            <layout id="narrow-left-2column" columns="2" column-length="4" image="/images/icons/layout_narrow_left_2column.gif"
+                  label-id="layout_narrow_left_label" description-id="layout_narrow_left_desc"
+                  jsp="/jsp/dashboards/layouts/narrow-left-2column.jsp" />
             <layout id="three-column" columns="3" column-length="4" image="/images/icons/layout_three_column.gif"
                   label-id="layout_three_column_label" description-id="layout_three_column_desc"
                   jsp="/jsp/dashboards/layouts/three-column.jsp" />
@@ -184,9 +184,20 @@
             <dashlet id="getting-started" label-id="dashlet_gettingstarted_label"
                   description-id="dashlet_gettingstarted_desc"
                   jsp="/jsp/dashboards/dashlets/getting-started.jsp" allow-narrow="false" />
-            <!-- TEMP -->
-            <dashlet id="task-list" label="My Tasklist" description="A description of the Task List"
-                  jsp="/jsp/dashboards/dashlets/tasklist.jsp" allow-narrow="false" />
+            <!-- TEMP! -->
+            <dashlet id="my-docs-template" label="My Documents"
+                  description="My Documents Template Page"
+                  jsp="/jsp/dashboards/dashlets/my-docs.jsp" allow-narrow="true" />
+            <dashlet id="task-list" label="My Tasklist To-do" description="List of your tasks still to complete"
+                  jsp="/jsp/dashboards/dashlets/tasklist-todo.jsp" allow-narrow="false" />
+            <dashlet id="task-list-complete" label="My Tasks Completed" description="List of your completed tasks"
+                  jsp="/jsp/dashboards/dashlets/tasklist-completed.jsp" allow-narrow="false" />
+            <dashlet id="content-checkedout" label="My Checkedout Content" description="List of the content checked out to you"
+                  jsp="/jsp/dashboards/dashlets/content-checkedout.jsp" allow-narrow="false" />
+            <dashlet id="calculator" label="Calculator" description="A small calculator applet"
+                  jsp="/jsp/dashboards/dashlets/calculator.jsp" allow-narrow="true" />
+            <dashlet id="calendar" label="Calendar" description="A small calendar application"
+                  jsp="/jsp/dashboards/dashlets/calendar.jsp" allow-narrow="true" />
          </dashlets>
       </dashboards>
    </config>
diff --git a/source/java/org/alfresco/web/bean/dashboard/DashboardManager.java b/source/java/org/alfresco/web/bean/dashboard/DashboardManager.java
index 920510b8e0..bea7e5f967 100644
--- a/source/java/org/alfresco/web/bean/dashboard/DashboardManager.java
+++ b/source/java/org/alfresco/web/bean/dashboard/DashboardManager.java
@@ -71,6 +71,7 @@ public class DashboardManager
    public void initDashboard()
    {
       this.renderingList = null;
+      this.titleList = null;
    }
    
    /**
@@ -157,9 +158,6 @@ public class DashboardManager
                   pageConfig.addPage(page);
                }
             }
-            
-            // persist the initial config for this user
-            //PreferencesService.getPreferences().setValue(PREF_DASHBOARD, pageConfig.toXML());
          }
          
          this.pageConfig = pageConfig;
@@ -174,6 +172,11 @@ public class DashboardManager
    public void savePageConfig(PageConfig config)
    {
       this.pageConfig = config;
+      
+      // reset cached values
+      initDashboard();
+      
+      // persist the changes
       PreferencesService.getPreferences().setValue(PREF_DASHBOARD, this.pageConfig.toXML());
    }
    
diff --git a/source/java/org/alfresco/web/bean/dashboard/DashboardWizard.java b/source/java/org/alfresco/web/bean/dashboard/DashboardWizard.java
index 6f1c0aa433..615570d480 100644
--- a/source/java/org/alfresco/web/bean/dashboard/DashboardWizard.java
+++ b/source/java/org/alfresco/web/bean/dashboard/DashboardWizard.java
@@ -155,6 +155,14 @@ public class DashboardWizard extends BaseWizardBean
       return DashboardManager.getDashboardConfig().getLayoutDefinition(getLayout()).Columns;
    }
    
+   /**
+    * @return the number of components per column supported in the selected page layout
+    */
+   public int getColumnMax()
+   {
+      return DashboardManager.getDashboardConfig().getLayoutDefinition(getLayout()).ColumnLength;
+   }
+   
    /**
     * @return the array of UI select items representing the columns that can be configured
     */
@@ -171,11 +179,20 @@ public class DashboardWizard extends BaseWizardBean
       return columns;
    }
    
+   /**
+    * @return the index of the column being edited in the columns wizard page
+    */
    public int getColumn()
    {
       return this.column;
    }
    
+   /**
+    * Set the index of the column being edited in the columns wizard page. This value is
+    * set when the Columns drop-down value is changed by the user.
+    * 
+    * @param column  Column index
+    */
    public void setColumn(int column)
    {
       if (column != this.column)
@@ -186,6 +203,9 @@ public class DashboardWizard extends BaseWizardBean
       }
    }
    
+   /**
+    * @return The SelectItem List of all available dashlets
+    */
    public List<SelectItem> getAllDashlets()
    {
       if (this.dashlets == null)
@@ -265,6 +285,10 @@ public class DashboardWizard extends BaseWizardBean
       return this.layoutIcons;
    }
    
+   /**
+    * Build the cached list of values for the layout page. The lists are used by the
+    * image radio picker and dynamic description components.
+    */
    private void buildLayoutValueLists()
    {
       List<UIListItem> icons = new ArrayList<UIListItem>(4);
@@ -319,14 +343,33 @@ public class DashboardWizard extends BaseWizardBean
       // get the IDs of the selected Dashlet definitions
       Object[] selected = dashletPicker.getSelectedValues();
       
-      // get the column to add the dashlets too
-      DashboardsConfigElement config = DashboardManager.getDashboardConfig();
-      LayoutDefinition layoutDef = this.editConfig.getCurrentPage().getLayoutDefinition();
-      Column column = this.editConfig.getCurrentPage().getColumns().get(this.column);
-      // add each selected dashlet to the column
-      for (int i=0; i<selected.length && column.getDashlets().size() < layoutDef.ColumnLength; i++)
+      if (selected.length != 0)
       {
-         column.addDashlet(config.getDashletDefinition((String)selected[i]));
+         // get the column to add the dashlets too
+         DashboardsConfigElement config = DashboardManager.getDashboardConfig();
+         LayoutDefinition layoutDef = this.editConfig.getCurrentPage().getLayoutDefinition();
+         Column column = this.editConfig.getCurrentPage().getColumns().get(this.column);
+         
+         // add each selected dashlet to the column
+         for (int i=0; i<selected.length && column.getDashlets().size() < layoutDef.ColumnLength; i++)
+         {
+            String dashletId = (String)selected[i];
+            
+            // don't add if already present in the list
+            boolean found = false;
+            for (int x=0; x<column.getDashlets().size(); x++)
+            {
+               if (column.getDashlets().get(x).Id.equals(dashletId))
+               {
+                  found = true;
+                  break;
+               }
+            }
+            if (found == false)
+            {
+               column.addDashlet(config.getDashletDefinition(dashletId));
+            }
+         }
       }
    }
    
@@ -339,15 +382,85 @@ public class DashboardWizard extends BaseWizardBean
       
       // get the ID of the selected Dashlet definition
       String dashletId = (String)dashletColumn.getValue();
-      Column column = this.editConfig.getCurrentPage().getColumns().get(this.column);
-      
-      // remove the selected dashlet from the column
-      for (int i=0; i<column.getDashlets().size(); i++)
+      if (dashletId != null)
       {
-         if (column.getDashlets().get(i).Id.equals(dashletId))
+         Column column = this.editConfig.getCurrentPage().getColumns().get(this.column);
+         
+         // remove the selected dashlet from the column
+         for (int i=0; i<column.getDashlets().size(); i++)
          {
-            column.getDashlets().remove(i);
-            break;
+            if (column.getDashlets().get(i).Id.equals(dashletId))
+            {
+               column.getDashlets().remove(i);
+               break;
+            }
+         }
+      }
+   }
+   
+   /**
+    * Action event called to move a dashlet up the column list
+    */
+   public void dashletUp(ActionEvent event)
+   {
+      UISelectOne dashletColumn = (UISelectOne)event.getComponent().findComponent(COMPONENT_COLUMNDASHLETS);
+      
+      // get the ID of the selected Dashlet definition
+      String dashletId = (String)dashletColumn.getValue();
+      if (dashletId != null)
+      {
+         Column column = this.editConfig.getCurrentPage().getColumns().get(this.column);
+         
+         // find the dashlet in the list
+         for (int i=0; i<column.getDashlets().size(); i++)
+         {
+            if (column.getDashlets().get(i).Id.equals(dashletId))
+            {
+               if (i != 0)
+               {
+                  DashletDefinition dashletDef = column.getDashlets().get(i);
+                  column.getDashlets().remove(i);
+                  column.getDashlets().add(i - 1, dashletDef);
+               }
+               break;
+            }
+         }
+      }
+   }
+   
+   /**
+    * Action event called to move a dashlet down the column list
+    */
+   public void dashletDown(ActionEvent event)
+   {
+      UISelectOne dashletColumn = (UISelectOne)event.getComponent().findComponent(COMPONENT_COLUMNDASHLETS);
+      
+      // get the ID of the selected Dashlet definition
+      String dashletId = (String)dashletColumn.getValue();
+      if (dashletId != null)
+      {
+         Column column = this.editConfig.getCurrentPage().getColumns().get(this.column);
+         
+         // find the dashlet in the list
+         for (int i=0; i<column.getDashlets().size(); i++)
+         {
+            if (column.getDashlets().get(i).Id.equals(dashletId))
+            {
+               if (i != column.getDashlets().size() - 1)
+               {
+                  DashletDefinition dashletDef = column.getDashlets().get(i);
+                  column.getDashlets().remove(i);
+                  if (i + 1 < column.getDashlets().size())
+                  {
+                     column.getDashlets().add(i + 1, dashletDef);
+                  }
+                  else
+                  {
+                     column.getDashlets().add(dashletDef);
+                  }
+               }
+               break;
+            }
          }
       }
    }
diff --git a/source/web/jsp/dashboards/dashlets/calculator.jsp b/source/web/jsp/dashboards/dashlets/calculator.jsp
new file mode 100644
index 0000000000..9a2b566850
--- /dev/null
+++ b/source/web/jsp/dashboards/dashlets/calculator.jsp
@@ -0,0 +1,22 @@
+<%--
+  Copyright (C) 2006 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<h:graphicImage value="/jsp/dashboards/dashlets/calculator.png" />
diff --git a/source/web/jsp/dashboards/dashlets/calculator.png b/source/web/jsp/dashboards/dashlets/calculator.png
new file mode 100644
index 0000000000..4cc80aeba9
Binary files /dev/null and b/source/web/jsp/dashboards/dashlets/calculator.png differ
diff --git a/source/web/jsp/dashboards/dashlets/calendar.jsp b/source/web/jsp/dashboards/dashlets/calendar.jsp
new file mode 100644
index 0000000000..90ebf9ae5a
--- /dev/null
+++ b/source/web/jsp/dashboards/dashlets/calendar.jsp
@@ -0,0 +1,22 @@
+<%--
+  Copyright (C) 2006 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<h:graphicImage value="/jsp/dashboards/dashlets/calendar.png" />
diff --git a/source/web/jsp/dashboards/dashlets/calendar.png b/source/web/jsp/dashboards/dashlets/calendar.png
new file mode 100644
index 0000000000..7ce352135e
Binary files /dev/null and b/source/web/jsp/dashboards/dashlets/calendar.png differ
diff --git a/source/web/jsp/dashboards/dashlets/content-checkedout.jsp b/source/web/jsp/dashboards/dashlets/content-checkedout.jsp
new file mode 100644
index 0000000000..a70b1fb3e0
--- /dev/null
+++ b/source/web/jsp/dashboards/dashlets/content-checkedout.jsp
@@ -0,0 +1,22 @@
+<%--
+  Copyright (C) 2006 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<h:graphicImage value="/jsp/dashboards/dashlets/content-checkedout.png" />
diff --git a/source/web/jsp/dashboards/dashlets/content-checkedout.png b/source/web/jsp/dashboards/dashlets/content-checkedout.png
new file mode 100644
index 0000000000..8063f8b4a5
Binary files /dev/null and b/source/web/jsp/dashboards/dashlets/content-checkedout.png differ
diff --git a/source/web/jsp/dashboards/dashlets/my-completed-tasks.png b/source/web/jsp/dashboards/dashlets/my-completed-tasks.png
new file mode 100644
index 0000000000..f53c1bbd04
Binary files /dev/null and b/source/web/jsp/dashboards/dashlets/my-completed-tasks.png differ
diff --git a/source/web/jsp/dashboards/dashlets/tasklist.jsp b/source/web/jsp/dashboards/dashlets/my-docs.jsp
similarity index 93%
rename from source/web/jsp/dashboards/dashlets/tasklist.jsp
rename to source/web/jsp/dashboards/dashlets/my-docs.jsp
index 74ac3923e7..e79ba1c20a 100644
--- a/source/web/jsp/dashboards/dashlets/tasklist.jsp
+++ b/source/web/jsp/dashboards/dashlets/my-docs.jsp
@@ -19,4 +19,4 @@
 <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
-<h:outputText value="---TASKLIST DASHLET---" />
+<r:template template="/alfresco/templates/my_docs.ftl" />
diff --git a/source/web/jsp/dashboards/dashlets/my-tasks-todo.png b/source/web/jsp/dashboards/dashlets/my-tasks-todo.png
new file mode 100644
index 0000000000..e34ceee2aa
Binary files /dev/null and b/source/web/jsp/dashboards/dashlets/my-tasks-todo.png differ
diff --git a/source/web/jsp/dashboards/dashlets/tasklist-completed.jsp b/source/web/jsp/dashboards/dashlets/tasklist-completed.jsp
new file mode 100644
index 0000000000..8ce35a5ae2
--- /dev/null
+++ b/source/web/jsp/dashboards/dashlets/tasklist-completed.jsp
@@ -0,0 +1,22 @@
+<%--
+  Copyright (C) 2006 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<h:graphicImage value="/jsp/dashboards/dashlets/my-completed-tasks.png" />
diff --git a/source/web/jsp/dashboards/dashlets/tasklist-todo.jsp b/source/web/jsp/dashboards/dashlets/tasklist-todo.jsp
new file mode 100644
index 0000000000..22d7f0c020
--- /dev/null
+++ b/source/web/jsp/dashboards/dashlets/tasklist-todo.jsp
@@ -0,0 +1,22 @@
+<%--
+  Copyright (C) 2006 Alfresco, Inc.
+ 
+  Licensed under the Mozilla Public License version 1.1 
+  with a permitted attribution clause. You may obtain a
+  copy of the License at
+ 
+    http://www.alfresco.org/legal/license.txt
+ 
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+  either express or implied. See the License for the specific
+  language governing permissions and limitations under the
+  License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
+<%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
+
+<h:graphicImage value="/jsp/dashboards/dashlets/my-tasks-todo.png" />
diff --git a/source/web/jsp/dashboards/layouts/narrow-left-2column.jsp b/source/web/jsp/dashboards/layouts/narrow-left-2column.jsp
index b542179227..37a2f2f8c7 100644
--- a/source/web/jsp/dashboards/layouts/narrow-left-2column.jsp
+++ b/source/web/jsp/dashboards/layouts/narrow-left-2column.jsp
@@ -24,25 +24,28 @@
 <h:panelGrid columns="2" cellpadding="2" cellspacing="2" width="100%" columnClasses="tableNarrowWidth,tableWideWidth">
    <% Application.getDashboardManager().initDashboard(); %>
    <h:panelGroup>
-      <a:panel label="#{DashboardManager.dashletTitle[0]}" id="dashlet-0" progressive="true" rendered="#{DashboardManager.dashletAvailable[0]}"
-               border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
+      <a:panel label="#{DashboardManager.dashletTitle[0]}" id="dashlet-0" rendered="#{DashboardManager.dashletAvailable[0]}"
+               border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" style="padding:4px">
          <f:subview id="dashlet-1-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(0)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[1]}" id="dashlet-1" progressive="true" rendered="#{DashboardManager.dashletAvailable[1]}"
-               border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[1]}" id="dashlet-1" rendered="#{DashboardManager.dashletAvailable[1]}"
+               border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" style="padding:4px">
          <f:subview id="dashlet-2-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(1)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[2]}" id="dashlet-2" progressive="true" rendered="#{DashboardManager.dashletAvailable[2]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[2]}" id="dashlet-2" rendered="#{DashboardManager.dashletAvailable[2]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-3-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(2)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[3]}" id="dashlet-3" progressive="true" rendered="#{DashboardManager.dashletAvailable[3]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[3]}" id="dashlet-3" rendered="#{DashboardManager.dashletAvailable[3]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-4-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(3)%>" />
@@ -50,25 +53,28 @@
       </a:panel>
    </h:panelGroup>
    <h:panelGroup>
-      <a:panel label="#{DashboardManager.dashletTitle[4]}" id="dashlet-4" progressive="true" rendered="#{DashboardManager.dashletAvailable[4]}"
+      <a:panel label="#{DashboardManager.dashletTitle[4]}" id="dashlet-4" rendered="#{DashboardManager.dashletAvailable[4]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-5-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(4)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[5]}" id="dashlet-5" progressive="true" rendered="#{DashboardManager.dashletAvailable[5]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[5]}" id="dashlet-5" rendered="#{DashboardManager.dashletAvailable[5]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-6-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(5)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[6]}" id="dashlet-6" progressive="true" rendered="#{DashboardManager.dashletAvailable[6]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[6]}" id="dashlet-6" rendered="#{DashboardManager.dashletAvailable[6]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-7-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(6)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[7]}" id="dashlet-7" progressive="true" rendered="#{DashboardManager.dashletAvailable[7]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[7]}" id="dashlet-7" rendered="#{DashboardManager.dashletAvailable[7]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-8-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(7)%>" />
diff --git a/source/web/jsp/dashboards/layouts/narrow-right-2column.jsp b/source/web/jsp/dashboards/layouts/narrow-right-2column.jsp
index d587b95438..d56814c8ca 100644
--- a/source/web/jsp/dashboards/layouts/narrow-right-2column.jsp
+++ b/source/web/jsp/dashboards/layouts/narrow-right-2column.jsp
@@ -24,25 +24,28 @@
 <h:panelGrid columns="2" cellpadding="2" cellspacing="2" width="100%" columnClasses="tableWideWidth,tableNarrowWidth">
    <% Application.getDashboardManager().initDashboard(); %>
    <h:panelGroup>
-      <a:panel label="#{DashboardManager.dashletTitle[0]}" id="dashlet-0" progressive="true" rendered="#{DashboardManager.dashletAvailable[0]}"
+      <a:panel label="#{DashboardManager.dashletTitle[0]}" id="dashlet-0" rendered="#{DashboardManager.dashletAvailable[0]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-1-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(0)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[1]}" id="dashlet-1" progressive="true" rendered="#{DashboardManager.dashletAvailable[1]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[1]}" id="dashlet-1" rendered="#{DashboardManager.dashletAvailable[1]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-2-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(1)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[2]}" id="dashlet-2" progressive="true" rendered="#{DashboardManager.dashletAvailable[2]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[2]}" id="dashlet-2" rendered="#{DashboardManager.dashletAvailable[2]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-3-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(2)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[3]}" id="dashlet-3" progressive="true" rendered="#{DashboardManager.dashletAvailable[3]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[3]}" id="dashlet-3" rendered="#{DashboardManager.dashletAvailable[3]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-4-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(3)%>" />
@@ -50,25 +53,28 @@
       </a:panel>
    </h:panelGroup>
    <h:panelGroup>
-      <a:panel label="#{DashboardManager.dashletTitle[4]}" id="dashlet-4" progressive="true" rendered="#{DashboardManager.dashletAvailable[4]}"
+      <a:panel label="#{DashboardManager.dashletTitle[4]}" id="dashlet-4" rendered="#{DashboardManager.dashletAvailable[4]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-5-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(4)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[5]}" id="dashlet-5" progressive="true" rendered="#{DashboardManager.dashletAvailable[5]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[5]}" id="dashlet-5" rendered="#{DashboardManager.dashletAvailable[5]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-6-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(5)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[6]}" id="dashlet-6" progressive="true" rendered="#{DashboardManager.dashletAvailable[6]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[6]}" id="dashlet-6" rendered="#{DashboardManager.dashletAvailable[6]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-7-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(6)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[7]}" id="dashlet-7" progressive="true" rendered="#{DashboardManager.dashletAvailable[7]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[7]}" id="dashlet-7" rendered="#{DashboardManager.dashletAvailable[7]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-8-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(7)%>" />
diff --git a/source/web/jsp/dashboards/layouts/single-column.jsp b/source/web/jsp/dashboards/layouts/single-column.jsp
index 3f66dd56b7..c9c597bdab 100644
--- a/source/web/jsp/dashboards/layouts/single-column.jsp
+++ b/source/web/jsp/dashboards/layouts/single-column.jsp
@@ -23,31 +23,31 @@
 
 <% Application.getDashboardManager().initDashboard(); %>
 <h:panelGrid columns="1" cellpadding="2" cellspacing="2" width="100%">
-   <a:panel label="#{DashboardManager.dashletTitle[0]}" id="dashlet-1" progressive="true" rendered="#{DashboardManager.dashletAvailable[0]}"
+   <a:panel label="#{DashboardManager.dashletTitle[0]}" id="dashlet-1" rendered="#{DashboardManager.dashletAvailable[0]}"
             border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
       <f:subview id="dashlet-1-view">
 			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(0)%>" />
 		</f:subview>
    </a:panel>
-   <a:panel label="#{DashboardManager.dashletTitle[1]}" id="dashlet-2" progressive="true" rendered="#{DashboardManager.dashletAvailable[1]}"
+   <a:panel label="#{DashboardManager.dashletTitle[1]}" id="dashlet-2" rendered="#{DashboardManager.dashletAvailable[1]}"
             border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
       <f:subview id="dashlet-2-view">
 			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(1)%>" />
 		</f:subview>
    </a:panel>
-   <a:panel label="#{DashboardManager.dashletTitle[2]}" id="dashlet-3" progressive="true" rendered="#{DashboardManager.dashletAvailable[2]}"
+   <a:panel label="#{DashboardManager.dashletTitle[2]}" id="dashlet-3" rendered="#{DashboardManager.dashletAvailable[2]}"
             border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
       <f:subview id="dashlet-3-view">
 			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(2)%>" />
 		</f:subview>
    </a:panel>
-   <a:panel label="#{DashboardManager.dashletTitle[3]}" id="dashlet-4" progressive="true" rendered="#{DashboardManager.dashletAvailable[3]}"
+   <a:panel label="#{DashboardManager.dashletTitle[3]}" id="dashlet-4" rendered="#{DashboardManager.dashletAvailable[3]}"
             border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
       <f:subview id="dashlet-4-view">
 			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(3)%>" />
 		</f:subview>
    </a:panel>
-   <a:panel label="#{DashboardManager.dashletTitle[4]}" id="dashlet-5" progressive="true" rendered="#{DashboardManager.dashletAvailable[4]}"
+   <a:panel label="#{DashboardManager.dashletTitle[4]}" id="dashlet-5" rendered="#{DashboardManager.dashletAvailable[4]}"
             border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
       <f:subview id="dashlet-5-view">
 			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(4)%>" />
diff --git a/source/web/jsp/dashboards/layouts/three-column.jsp b/source/web/jsp/dashboards/layouts/three-column.jsp
index 677b41158f..586705cbe0 100644
--- a/source/web/jsp/dashboards/layouts/three-column.jsp
+++ b/source/web/jsp/dashboards/layouts/three-column.jsp
@@ -21,28 +21,31 @@
 
 <%@ page import="org.alfresco.web.app.Application" %>
 
-<h:panelGrid columns="3" cellpadding="2" cellspacing="2" width="100%" columnClasses="tableThirdWidth">
+<h:panelGrid columns="3" cellpadding="2" cellspacing="2" width="100%" columnClasses="tableThirdWidth,tableThirdWidth,tableThirdWidth">
    <% Application.getDashboardManager().initDashboard(); %>
    <h:panelGroup>
-      <a:panel label="#{DashboardManager.dashletTitle[0]}" id="dashlet-0" progressive="true" rendered="#{DashboardManager.dashletAvailable[0]}"
+      <a:panel label="#{DashboardManager.dashletTitle[0]}" id="dashlet-0" rendered="#{DashboardManager.dashletAvailable[0]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-1-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(0)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[1]}" id="dashlet-1" progressive="true" rendered="#{DashboardManager.dashletAvailable[1]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[1]}" id="dashlet-1" rendered="#{DashboardManager.dashletAvailable[1]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-2-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(1)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[2]}" id="dashlet-2" progressive="true" rendered="#{DashboardManager.dashletAvailable[2]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[2]}" id="dashlet-2" rendered="#{DashboardManager.dashletAvailable[2]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-3-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(2)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[3]}" id="dashlet-3" progressive="true" rendered="#{DashboardManager.dashletAvailable[3]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[3]}" id="dashlet-3" rendered="#{DashboardManager.dashletAvailable[3]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
          <f:subview id="dashlet-4-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(3)%>" />
@@ -50,53 +53,59 @@
       </a:panel>
    </h:panelGroup>
    <h:panelGroup>
-      <a:panel label="#{DashboardManager.dashletTitle[4]}" id="dashlet-4" progressive="true" rendered="#{DashboardManager.dashletAvailable[4]}"
+      <a:panel label="#{DashboardManager.dashletTitle[4]}" id="dashlet-4" rendered="#{DashboardManager.dashletAvailable[4]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
-         <f:subview id="dashlet-1-view">
+         <f:subview id="dashlet-5-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(4)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[5]}" id="dashlet-5" progressive="true" rendered="#{DashboardManager.dashletAvailable[5]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[5]}" id="dashlet-5" rendered="#{DashboardManager.dashletAvailable[5]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
-         <f:subview id="dashlet-2-view">
+         <f:subview id="dashlet-6-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(5)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[6]}" id="dashlet-6" progressive="true" rendered="#{DashboardManager.dashletAvailable[6]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[6]}" id="dashlet-6" rendered="#{DashboardManager.dashletAvailable[6]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
-         <f:subview id="dashlet-3-view">
+         <f:subview id="dashlet-7-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(6)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[7]}" id="dashlet-7" progressive="true" rendered="#{DashboardManager.dashletAvailable[7]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[7]}" id="dashlet-7" rendered="#{DashboardManager.dashletAvailable[7]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
-         <f:subview id="dashlet-4-view">
+         <f:subview id="dashlet-8-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(7)%>" />
    		</f:subview>
       </a:panel>
    </h:panelGroup>
    <h:panelGroup>
-      <a:panel label="#{DashboardManager.dashletTitle[8]}" id="dashlet-8" progressive="true" rendered="#{DashboardManager.dashletAvailable[8]}"
+      <a:panel label="#{DashboardManager.dashletTitle[8]}" id="dashlet-8" rendered="#{DashboardManager.dashletAvailable[8]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
-         <f:subview id="dashlet-1-view">
+         <f:subview id="dashlet-9-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(8)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[9]}" id="dashlet-9" progressive="true" rendered="#{DashboardManager.dashletAvailable[9]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[9]}" id="dashlet-9" rendered="#{DashboardManager.dashletAvailable[9]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
-         <f:subview id="dashlet-2-view">
+         <f:subview id="dashlet-10-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(9)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[10]}" id="dashlet-10" progressive="true" rendered="#{DashboardManager.dashletAvailable[10]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[10]}" id="dashlet-10" rendered="#{DashboardManager.dashletAvailable[10]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
-         <f:subview id="dashlet-3-view">
+         <f:subview id="dashlet-11-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(10)%>" />
    		</f:subview>
       </a:panel>
-      <a:panel label="#{DashboardManager.dashletTitle[11]}" id="dashlet-11" progressive="true" rendered="#{DashboardManager.dashletAvailable[11]}"
+      <f:verbatim><div style='padding:4px'></div></f:verbatim>
+      <a:panel label="#{DashboardManager.dashletTitle[11]}" id="dashlet-11" rendered="#{DashboardManager.dashletAvailable[11]}"
                border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE">
-         <f:subview id="dashlet-4-view">
+         <f:subview id="dashlet-12-view">
    			<jsp:include page="<%=Application.getDashboardManager().getDashletPage(11)%>" />
    		</f:subview>
       </a:panel>
diff --git a/source/web/jsp/dashboards/wizard/columns.jsp b/source/web/jsp/dashboards/wizard/columns.jsp
index 7b0017d07b..eb34724772 100644
--- a/source/web/jsp/dashboards/wizard/columns.jsp
+++ b/source/web/jsp/dashboards/wizard/columns.jsp
@@ -40,6 +40,10 @@
       <h:selectOneMenu id="columns" value="#{WizardManager.bean.column}" onchange="document.forms['wizard'].submit(); return true;">
          <f:selectItems value="#{WizardManager.bean.columns}" />
       </h:selectOneMenu>
+      <f:verbatim>&nbsp;</f:verbatim>
+      <h:outputFormat value="- #{msg.column_max_components}">
+         <f:param value="#{WizardManager.bean.columnMax}" />
+      </h:outputFormat>
    </h:panelGroup>
    
    <h:panelGrid columns="3" cellpadding="2" cellspacing="0" border="0" columnClasses="alignTop,alignMiddle">