diff --git a/source/web/jsp/dashboards/wizard/columns.jsp b/source/web/jsp/dashboards/wizard/columns.jsp
index eb34724772..511c2bd8da 100644
--- a/source/web/jsp/dashboards/wizard/columns.jsp
+++ b/source/web/jsp/dashboards/wizard/columns.jsp
@@ -33,8 +33,8 @@
    </script>
 </f:verbatim>
 
-<h:panelGrid columns="1" cellpadding="2" cellspacing="0" border="0" width="100%">
-   <h:panelGroup rendered="#{WizardManager.bean.columnCount != 1}">
+<h:panelGrid id="main-panel" columns="1" cellpadding="2" cellspacing="0" border="0" width="100%">
+   <h:panelGroup id="panel1" rendered="#{WizardManager.bean.columnCount != 1}">
       <h:outputText value="#{msg.select_column}:" />
       <f:verbatim>&nbsp;</f:verbatim>
       <h:selectOneMenu id="columns" value="#{WizardManager.bean.column}" onchange="document.forms['wizard'].submit(); return true;">
@@ -46,8 +46,8 @@
       </h:outputFormat>
    </h:panelGroup>
    
-   <h:panelGrid columns="3" cellpadding="2" cellspacing="0" border="0" columnClasses="alignTop,alignMiddle">
-      <h:panelGrid columns="1" cellpadding="2" border="0">
+   <h:panelGrid id="panel2" columns="3" cellpadding="2" cellspacing="0" border="0" columnClasses="alignTop,alignMiddle">
+      <h:panelGrid id="panel3" columns="1" cellpadding="2" border="0">
          <h:outputText value="#{msg.dashlet_list}:" />
          <%-- note this component ID is referenced in DashboardWizard --%>
          <h:selectManyListbox id="all-dashlets" style="width:300px" size="8">
@@ -55,22 +55,22 @@
          </h:selectManyListbox>
       </h:panelGrid>
       
-      <h:commandButton value="#{msg.dashlet_btn_select} >>" actionListener="#{WizardManager.bean.addDashlets}" />
+      <h:commandButton id="select-btn" value="#{msg.dashlet_btn_select} >>" actionListener="#{WizardManager.bean.addDashlets}" />
       
-      <h:panelGrid columns="1" cellpadding="2" border="0">
+      <h:panelGrid id="panel4" columns="1" cellpadding="2" border="0">
          <h:outputText value="#{msg.selected_dashlets}:" />
-         <h:panelGrid columns="2" cellpadding="2" cellspacing="0" border="0">
+         <h:panelGrid id="panel5" columns="2" cellpadding="2" cellspacing="0" border="0">
             <%-- note this component ID is referenced in DashboardWizard --%>
             <h:selectOneListbox id="column-dashlets" style="width:150px" size="8">
                <f:selectItems value="#{WizardManager.bean.columnDashlets}" />
             </h:selectOneListbox>
-            <h:panelGroup>
+            <h:panelGroup id="panel6">
                <h:commandButton value="+" style="width:24px" actionListener="#{WizardManager.bean.dashletUp}" />
                <f:verbatim><br></f:verbatim>
                <h:commandButton value="-" style="width:24px" actionListener="#{WizardManager.bean.dashletDown}"/>
             </h:panelGroup>
          </h:panelGrid>
-         <h:commandButton value="#{msg.dashlet_btn_remove}" actionListener="#{WizardManager.bean.removeDashlet}" />
+         <h:commandButton id="remove-btn" value="#{msg.dashlet_btn_remove}" actionListener="#{WizardManager.bean.removeDashlet}" />
       </h:panelGrid>
    </h:panelGrid>
 </h:panelGrid>
diff --git a/source/web/jsp/workflow/manage-task-dialog.jsp b/source/web/jsp/workflow/manage-task-dialog.jsp
index 131268c079..f3816e9996 100644
--- a/source/web/jsp/workflow/manage-task-dialog.jsp
+++ b/source/web/jsp/workflow/manage-task-dialog.jsp
@@ -19,14 +19,14 @@
 <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
-<a:panel id="props-panel" label="#{msg.task_properties}" 
+<a:panel id="metadata-panel" label="#{msg.task_properties}" 
          border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
    
    <r:propertySheetGrid id="task-props" value="#{DialogManager.bean.taskNode}"
                        var="taskProps" columns="1" externalConfig="true" />
 </a:panel>
 
-<h:outputText styleClass="paddingRow" value="&nbsp;" escape="false" />
+<h:outputText id="padding1" styleClass="paddingRow" value="&nbsp;" escape="false" />
 
 <a:panel id="resources-panel" label="#{msg.resources}"
          border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
@@ -38,60 +38,60 @@
                initialSortColumn="name" initialSortDescending="true">
       
       <%-- Name column --%>
-      <a:column primary="true" width="200" style="padding:2px; text-align:left">
+      <a:column id="col1" primary="true" width="200" style="padding:2px; text-align:left">
          <f:facet name="header">
-            <a:sortLink label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
+            <a:sortLink id="col1-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
          </f:facet>
          <f:facet name="small-icon">
-               <a:actionLink value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}" 
+               <a:actionLink id="col1-act1" value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}" 
                              showLink="false" styleClass="inlineAction" />
          </f:facet>
-         <a:actionLink value="#{r.name}" href="#{r.url}" target="new" />
-         <r:lockIcon value="#{r.nodeRef}" align="absmiddle" />
+         <a:actionLink id="col1-act2" value="#{r.name}" href="#{r.url}" target="new" />
+         <r:lockIcon id="col1-lock" value="#{r.nodeRef}" align="absmiddle" />
       </a:column>
       
       <%-- Description column --%>
-      <a:column style="text-align:left">
+      <a:column id="col2" style="text-align:left">
          <f:facet name="header">
-            <a:sortLink label="#{msg.description}" value="description" styleClass="header"/>
+            <a:sortLink id="col2-sort" label="#{msg.description}" value="description" styleClass="header"/>
          </f:facet>
-         <h:outputText value="#{r.description}" />
+         <h:outputText id="col2-txt" value="#{r.description}" />
       </a:column>
       
       <%-- Path column --%>
-      <a:column style="text-align:left">
+      <a:column id="col3" style="text-align:left">
          <f:facet name="header">
-            <a:sortLink label="#{msg.path}" value="path" styleClass="header"/>
+            <a:sortLink id="col3-sort" label="#{msg.path}" value="path" styleClass="header"/>
          </f:facet>
-         <r:nodePath value="#{r.path}" />
+         <r:nodePath id="col3-path" value="#{r.path}" />
       </a:column>
       
       <%-- Created Date column --%>
-      <a:column style="text-align:left">
+      <a:column id="col4" style="text-align:left">
          <f:facet name="header">
-            <a:sortLink label="#{msg.created}" value="created" styleClass="header"/>
+            <a:sortLink id="col4-sort" label="#{msg.created}" value="created" styleClass="header"/>
          </f:facet>
-         <h:outputText value="#{r.created}">
+         <h:outputText id="col4-txt" value="#{r.created}">
             <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
          </h:outputText>
       </a:column>
       
       <%-- Modified Date column --%>
-      <a:column style="text-align:left">
+      <a:column id="col5" style="text-align:left">
          <f:facet name="header">
-            <a:sortLink label="#{msg.modified}" value="modified" styleClass="header"/>
+            <a:sortLink id="col5-sort" label="#{msg.modified}" value="modified" styleClass="header"/>
          </f:facet>
-         <h:outputText value="#{r.modified}">
+         <h:outputText id="col5-txt" value="#{r.modified}">
             <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
          </h:outputText>
       </a:column>
                         
       <%-- Actions column --%>
-      <a:column actions="true" style="text-align:left">
+      <a:column id="col6" actions="true" style="text-align:left">
          <f:facet name="header">
-            <h:outputText value="#{msg.actions}"/>
+            <h:outputText id="col6-txt" value="#{msg.actions}"/>
          </f:facet>
-         <r:actions value="#{DialogManager.bean.packageItemActionGroup}" 
+         <r:actions id="col6-actions" value="#{DialogManager.bean.packageItemActionGroup}" 
                     context="#{r}" showLink="false" styleClass="inlineAction" />
       </a:column>
       
@@ -108,12 +108,14 @@
       --%>
    </a:richList>
 
-   <h:panelGrid columns="1" styleClass="paddingRow">
-      <r:actions context="#{DialogManager.bean.taskNode}" value="#{DialogManager.bean.packageActionGroup}" />
+   <h:panelGrid id="package-actions-group" columns="1" styleClass="paddingRow">
+      <r:actions id="package-actions" context="#{DialogManager.bean.taskNode}" 
+                 value="#{DialogManager.bean.packageActionGroup}" />
    </h:panelGrid>
    
-   <h:panelGrid columns="1" rendered="#{DialogManager.bean.itemBeingAdded}" styleClass="selector" style="margin-top: 6px;">
-      <r:contentSelector value="#{DialogManager.bean.itemsToAdd}" styleClass="" />
+   <h:panelGrid id="add-item-control" columns="1" rendered="#{DialogManager.bean.itemBeingAdded}" 
+                styleClass="selector" style="margin-top: 6px;">
+      <r:contentSelector id="content-picker" value="#{DialogManager.bean.itemsToAdd}" styleClass="" />
       <h:panelGrid columns="2">
          <h:commandButton value="#{msg.add_to_list_button}" actionListener="#{DialogManager.bean.addPackageItems}" />
          <h:commandButton value="#{msg.cancel}" actionListener="#{DialogManager.bean.cancelAddPackageItems}" />
@@ -122,11 +124,11 @@
    
 </a:panel>
 
-<h:outputText styleClass="paddingRow" value="&nbsp;" escape="false" />
+<h:outputText id="padding2" styleClass="paddingRow" value="&nbsp;" escape="false" />
 
 <a:panel id="workflow-summary-panel" label="#{msg.part_of_workflow}"
          border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
 
-   <r:workflowSummary value="#{DialogManager.bean.workflowInstance}" styleClass="workflowSummary" />
+   <r:workflowSummary id="workflow-summary" value="#{DialogManager.bean.workflowInstance}" styleClass="workflowSummary" />
 
 </a:panel>
\ No newline at end of file
diff --git a/source/web/jsp/workflow/reassign-task-dialog.jsp b/source/web/jsp/workflow/reassign-task-dialog.jsp
index 0e14e13887..4a4f37b5c4 100644
--- a/source/web/jsp/workflow/reassign-task-dialog.jsp
+++ b/source/web/jsp/workflow/reassign-task-dialog.jsp
@@ -23,7 +23,7 @@
 <%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
 <%@ page isELIgnored="false" %>
 
-<h:outputText value="#{msg.reassign_select_user}<br/><br/>" escape="false" />
+<h:outputText id="txt" value="#{msg.reassign_select_user}<br/><br/>" escape="false" />
 
 <a:genericPicker id="user-picker" showAddButton="false" filters="#{DialogManager.bean.filters}" 
                  queryCallback="#{DialogManager.bean.pickerCallback}" multiSelect="false" />
diff --git a/source/web/jsp/workflow/start-workflow-wizard/workflow-options.jsp b/source/web/jsp/workflow/start-workflow-wizard/workflow-options.jsp
index 4e2b0af400..ca5e0873d8 100644
--- a/source/web/jsp/workflow/start-workflow-wizard/workflow-options.jsp
+++ b/source/web/jsp/workflow/start-workflow-wizard/workflow-options.jsp
@@ -21,7 +21,7 @@
 
 <%@ page import="org.alfresco.web.ui.common.PanelGenerator" %>
 
-<h:panelGroup rendered="#{WizardManager.bean.taskMetadataNode == null}">
+<h:panelGroup id="no-metadata-panel" rendered="#{WizardManager.bean.taskMetadataNode == null}">
    <f:verbatim>
       <%PanelGenerator.generatePanelStart(out, request.getContextPath(), "yellowInner", "#ffffcc");%>
       <table><tr><td>
@@ -37,97 +37,98 @@
    </f:verbatim>
 </h:panelGroup>
 
-<h:panelGroup rendered="#{WizardManager.bean.taskMetadataNode != null}">
-   <a:panel id="props-panel" label="#{msg.properties}" border="white" bgcolor="white" 
-            titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
+<a:panel id="metadata-panel" label="#{msg.properties}" rendered="#{WizardManager.bean.taskMetadataNode != null}"
+         border="white" bgcolor="white" 
+         titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
+   
+   <r:propertySheetGrid id="task-props" value="#{WizardManager.bean.taskMetadataNode}" 
+                        var="taskProps" columns="1" externalConfig="true" />
+</a:panel>
+   
+<h:outputText id="padding" styleClass="paddingRow" value="&nbsp;" escape="false" />
+
+<a:panel id="resources-panel" label="#{msg.resources}"
+      border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
+
+   <a:richList id="resources-list" viewMode="details" value="#{WizardManager.bean.resources}" var="r"
+               binding="#{WizardManager.bean.packageItemsRichList}"
+               styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" 
+               altRowStyleClass="recordSetRowAlt" width="100%" pageSize="10"
+               initialSortColumn="name" initialSortDescending="true">
       
-      <r:propertySheetGrid id="task-props" value="#{WizardManager.bean.taskMetadataNode}" 
-                           var="taskProps" columns="1" externalConfig="true" />
-   </a:panel>
+      <%-- Name column --%>
+      <a:column id="col1" primary="true" width="200" style="padding:2px; text-align:left">
+         <f:facet name="header">
+            <a:sortLink id="col1-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
+         </f:facet>
+         <f:facet name="small-icon">
+               <a:actionLink id="col1-act1" value="#{r.name}" href="#{r.url}" target="new" 
+                             image="#{r.fileType16}" showLink="false" styleClass="inlineAction" />
+         </f:facet>
+         <a:actionLink id="col1-act2" value="#{r.name}" href="#{r.url}" target="new" />
+      </a:column>
+      
+      <%-- Description column --%>
+      <a:column id="col2" style="text-align:left">
+         <f:facet name="header">
+            <a:sortLink id="col2-sort" label="#{msg.description}" value="description" styleClass="header"/>
+         </f:facet>
+         <h:outputText id="col2-txt" value="#{r.description}" />
+      </a:column>
+      
+      <%-- Path column --%>
+      <a:column id="col3" style="text-align:left">
+         <f:facet name="header">
+            <a:sortLink id="col3-sort" label="#{msg.path}" value="path" styleClass="header"/>
+         </f:facet>
+         <r:nodePath id="col3-path" value="#{r.path}" />
+      </a:column>
+      
+      <%-- Created Date column --%>
+      <a:column id="col4" style="text-align:left">
+         <f:facet name="header">
+            <a:sortLink id="col4-sort" label="#{msg.created}" value="created" styleClass="header"/>
+         </f:facet>
+         <h:outputText id="col4-txt" value="#{r.created}">
+            <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+         </h:outputText>
+      </a:column>
+      
+      <%-- Modified Date column --%>
+      <a:column id="col5" style="text-align:left">
+         <f:facet name="header">
+            <a:sortLink id="col5-sort" label="#{msg.modified}" value="modified" styleClass="header"/>
+         </f:facet>
+         <h:outputText id="col5-txt" value="#{r.modified}">
+            <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
+         </h:outputText>
+      </a:column>
+                        
+      <%-- Actions column --%>
+      <a:column id="col6" actions="true" style="text-align:left">
+         <f:facet name="header">
+            <h:outputText id="col6-txt" value="#{msg.actions}"/>
+         </f:facet>
+         <r:actions id="col6-actions" value="#{WizardManager.bean.packageItemActionGroup}" 
+                    context="#{r}" showLink="false" styleClass="inlineAction" />
+      </a:column>
+   </a:richList>
+
+   <h:panelGrid id="package-actions-group" columns="1" styleClass="paddingRow">
+      <r:actions id="package-actions" context="#{WizardManager.bean.taskMetadataNode}" 
+                 value="#{WizardManager.bean.packageActionGroup}" />
+   </h:panelGrid>
    
-   <h:outputText styleClass="paddingRow" value="&nbsp;" escape="false" />
-   
-   <a:panel id="resources-panel" label="#{msg.resources}"
-         border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
-   
-      <a:richList id="resources-list" viewMode="details" value="#{WizardManager.bean.resources}" var="r"
-                  binding="#{WizardManager.bean.packageItemsRichList}"
-                  styleClass="recordSet" headerStyleClass="recordSetHeader" rowStyleClass="recordSetRow" 
-                  altRowStyleClass="recordSetRowAlt" width="100%" pageSize="10"
-                  initialSortColumn="name" initialSortDescending="true">
-         
-         <%-- Name column --%>
-         <a:column primary="true" width="200" style="padding:2px; text-align:left">
-            <f:facet name="header">
-               <a:sortLink label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
-            </f:facet>
-            <f:facet name="small-icon">
-                  <a:actionLink value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}" 
-                                showLink="false" styleClass="inlineAction" />
-            </f:facet>
-            <a:actionLink value="#{r.name}" href="#{r.url}" target="new" />
-         </a:column>
-         
-         <%-- Description column --%>
-         <a:column style="text-align:left">
-            <f:facet name="header">
-               <a:sortLink label="#{msg.description}" value="description" styleClass="header"/>
-            </f:facet>
-            <h:outputText value="#{r.description}" />
-         </a:column>
-         
-         <%-- Path column --%>
-         <a:column style="text-align:left">
-            <f:facet name="header">
-               <a:sortLink label="#{msg.path}" value="path" styleClass="header"/>
-            </f:facet>
-            <r:nodePath value="#{r.path}" />
-         </a:column>
-         
-         <%-- Created Date column --%>
-         <a:column style="text-align:left">
-            <f:facet name="header">
-               <a:sortLink label="#{msg.created}" value="created" styleClass="header"/>
-            </f:facet>
-            <h:outputText value="#{r.created}">
-               <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
-            </h:outputText>
-         </a:column>
-         
-         <%-- Modified Date column --%>
-         <a:column style="text-align:left">
-            <f:facet name="header">
-               <a:sortLink label="#{msg.modified}" value="modified" styleClass="header"/>
-            </f:facet>
-            <h:outputText value="#{r.modified}">
-               <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
-            </h:outputText>
-         </a:column>
-                           
-         <%-- Actions column --%>
-         <a:column actions="true" style="text-align:left">
-            <f:facet name="header">
-               <h:outputText value="#{msg.actions}"/>
-            </f:facet>
-            <r:actions id="actions-col-actions" value="#{WizardManager.bean.packageItemActionGroup}" 
-                       context="#{r}" showLink="false" styleClass="inlineAction" />
-         </a:column>
-      </a:richList>
-   
-      <h:panelGrid columns="1" styleClass="paddingRow">
-         <r:actions context="#{WizardManager.bean.taskMetadataNode}" value="#{WizardManager.bean.packageActionGroup}" />
+   <h:panelGrid id="add-item-control" columns="1" rendered="#{WizardManager.bean.itemBeingAdded}" 
+                styleClass="selector" style="margin-top: 6px;">
+      <r:contentSelector id="content-picker" value="#{WizardManager.bean.itemsToAdd}" styleClass="" />
+      <h:panelGrid columns="2">
+         <h:commandButton value="#{msg.add_to_list_button}" actionListener="#{WizardManager.bean.addPackageItems}" />
+         <h:commandButton value="#{msg.cancel}" actionListener="#{WizardManager.bean.cancelAddPackageItems}" />
       </h:panelGrid>
-      
-      <h:panelGrid columns="1" rendered="#{WizardManager.bean.itemBeingAdded}" styleClass="selector" style="margin-top: 6px;">
-         <r:contentSelector value="#{WizardManager.bean.itemsToAdd}" styleClass="" />
-         <h:panelGrid columns="2">
-            <h:commandButton value="#{msg.add_to_list_button}" actionListener="#{WizardManager.bean.addPackageItems}" />
-            <h:commandButton value="#{msg.cancel}" actionListener="#{WizardManager.bean.cancelAddPackageItems}" />
-         </h:panelGrid>
-      </h:panelGrid>
-      
-   </a:panel>
-</h:panelGroup>
+   </h:panelGrid>
+   
+</a:panel>
 
 
 
diff --git a/source/web/jsp/workflow/tasks-completed-dashlet.jsp b/source/web/jsp/workflow/tasks-completed-dashlet.jsp
index 0efb655524..8b624bc8cf 100644
--- a/source/web/jsp/workflow/tasks-completed-dashlet.jsp
+++ b/source/web/jsp/workflow/tasks-completed-dashlet.jsp
@@ -9,64 +9,64 @@
             initialSortColumn="name" initialSortDescending="true">
 
    <%-- Primary column for details view mode --%>
-   <a:column primary="true" width="200" style="padding:2px;text-align:left">
+   <a:column id="col1" primary="true" width="200" style="padding:2px;text-align:left">
       <f:facet name="header">
-         <a:sortLink label="#{msg.title}" value="name" mode="case-insensitive" styleClass="header"/>
+         <a:sortLink id="col1-sort" label="#{msg.title}" value="name" mode="case-insensitive" styleClass="header"/>
       </f:facet>
       <f:facet name="small-icon">
-         <a:actionLink value="#{r.name}" image="/images/icons/completed_workflow_task.gif" showLink="false"
+         <a:actionLink id="col1-act1" value="#{r.name}" image="/images/icons/completed_workflow_task.gif" showLink="false"
                        actionListener="#{DialogManager.setupParameters}" action="dialog:viewCompletedTask">
             <f:param name="id" value="#{r.id}" />
          </a:actionLink>
       </f:facet>
-      <a:actionLink value="#{r.name}" actionListener="#{DialogManager.setupParameters}" 
+      <a:actionLink id="col1-act2" value="#{r.name}" actionListener="#{DialogManager.setupParameters}" 
                     action="dialog:viewCompletedTask">
          <f:param name="id" value="#{r.id}" />
       </a:actionLink>
    </a:column>
    
    <%-- Task id column --%>
-   <a:column style="text-align:left">
+   <a:column id="col2" style="text-align:left">
       <f:facet name="header">
-         <a:sortLink label="#{msg.id}" value="bpm:taskId" styleClass="header"/>
+         <a:sortLink id="col2-sort" label="#{msg.id}" value="bpm:taskId" styleClass="header"/>
       </f:facet>
-      <h:outputText value="#{r['bpm:taskId']}" />
+      <h:outputText id="col2-txt" value="#{r['bpm:taskId']}" />
    </a:column>
    
    <%-- Source column --%>
-   <a:column style="text-align:left">
+   <a:column id="col3" style="text-align:left">
       <f:facet name="header">
-         <a:sortLink label="#{msg.source}" value="sourceSpaceName" styleClass="header"/>
+         <a:sortLink id="col3-sort" label="#{msg.source}" value="sourceSpaceName" styleClass="header"/>
       </f:facet>
-      <h:outputText value="#{r.sourceSpaceName}" />
+      <h:outputText id="col3-txt" value="#{r.sourceSpaceName}" />
    </a:column>
    
    <%-- Completed date column --%>
-   <a:column style="text-align:left">
+   <a:column id="col4" style="text-align:left">
       <f:facet name="header">
-         <a:sortLink label="#{msg.completed_on}" value="bpm:completionDate" styleClass="header"/>
+         <a:sortLink id="col4-sort" label="#{msg.completed_on}" value="bpm:completionDate" styleClass="header"/>
       </f:facet>
-      <h:outputText value="#{r['bpm:completionDate']}">
+      <h:outputText id="col4-txt" value="#{r['bpm:completionDate']}">
          <a:convertXMLDate type="both" pattern="#{msg.date_pattern}" />
       </h:outputText>
    </a:column>
    
    <%-- Outcome column --%>
-   <a:column style="text-align:left">
+   <a:column id="col5" style="text-align:left">
       <f:facet name="header">
-         <a:sortLink label="#{msg.outcome}" value="outcome" styleClass="header"/>
+         <a:sortLink id="col5-sort" label="#{msg.outcome}" value="outcome" styleClass="header"/>
       </f:facet>
-      <h:outputText value="#{r.outcome}" />
+      <h:outputText id="col5-txt" value="#{r.outcome}" />
    </a:column>
    
    <%-- Actions column --%>
-   <a:column actions="true" style="text-align:left">
+   <a:column id="col6" actions="true" style="text-align:left">
       <f:facet name="header">
-         <h:outputText value="#{msg.actions}"/>
+         <h:outputText id="col6-txt" value="#{msg.actions}"/>
       </f:facet>
-      <r:actions value="dashlet_completed_actions" context="#{r}" showLink="false" 
+      <r:actions id="col6-actions" value="dashlet_completed_actions" context="#{r}" showLink="false" 
                  styleClass="inlineAction" />
    </a:column>
    
-   <a:dataPager styleClass="pager" />
+   <a:dataPager id="pager" styleClass="pager" />
 </a:richList>
\ No newline at end of file
diff --git a/source/web/jsp/workflow/tasks-todo-dashlet.jsp b/source/web/jsp/workflow/tasks-todo-dashlet.jsp
index ee386f5ca5..3b1b872932 100644
--- a/source/web/jsp/workflow/tasks-todo-dashlet.jsp
+++ b/source/web/jsp/workflow/tasks-todo-dashlet.jsp
@@ -9,72 +9,72 @@
             initialSortColumn="name" initialSortDescending="true">
 
    <%-- Primary column for details view mode --%>
-   <a:column primary="true" width="200" style="padding:2px;text-align:left">
+   <a:column id="col1" primary="true" width="200" style="padding:2px;text-align:left">
       <f:facet name="header">
-         <a:sortLink label="#{msg.title}" value="name" mode="case-insensitive" styleClass="header"/>
+         <a:sortLink id="col1-sort" label="#{msg.title}" value="name" mode="case-insensitive" styleClass="header"/>
       </f:facet>
       <f:facet name="small-icon">
-         <a:actionLink value="#{r.name}" image="/images/icons/workflow_task.gif" showLink="false"
+         <a:actionLink id="col1-act1" value="#{r.name}" image="/images/icons/workflow_task.gif" showLink="false"
                        actionListener="#{DialogManager.setupParameters}" action="dialog:manageTask">
             <f:param name="id" value="#{r.id}" />
          </a:actionLink>
       </f:facet>
-      <a:actionLink value="#{r.name}" actionListener="#{DialogManager.setupParameters}" 
+      <a:actionLink id="col1-act2" value="#{r.name}" actionListener="#{DialogManager.setupParameters}" 
                     action="dialog:manageTask">
          <f:param name="id" value="#{r.id}" />
       </a:actionLink>
    </a:column>
    
    <%-- Task id column --%>
-   <a:column style="text-align:left">
+   <a:column id="col2" style="text-align:left">
       <f:facet name="header">
-         <a:sortLink label="#{msg.id}" value="bpm:taskId" styleClass="header"/>
+         <a:sortLink id="col2-sort" label="#{msg.id}" value="bpm:taskId" styleClass="header"/>
       </f:facet>
-      <h:outputText value="#{r['bpm:taskId']}" />
+      <h:outputText id="col2-txt" value="#{r['bpm:taskId']}" />
    </a:column>
    
    <%-- Source column --%>
-   <a:column style="text-align:left">
+   <a:column id="col3" style="text-align:left">
       <f:facet name="header">
-         <a:sortLink label="#{msg.source}" value="sourceSpaceName" styleClass="header"/>
+         <a:sortLink id="col3-sort" label="#{msg.source}" value="sourceSpaceName" styleClass="header"/>
       </f:facet>
-      <h:outputText value="#{r.sourceSpaceName}" />
+      <h:outputText id="col3-txt" value="#{r.sourceSpaceName}" />
    </a:column>
    
    <%-- Due date column --%>
-   <a:column style="text-align:left">
+   <a:column id="col4" style="text-align:left">
       <f:facet name="header">
-         <a:sortLink label="#{msg.due_date}" value="bpm:startDate" styleClass="header"/>
+         <a:sortLink id="col4-sort" label="#{msg.due_date}" value="bpm:startDate" styleClass="header"/>
       </f:facet>
-      <h:outputText value="#{r['bpm:dueDate']}">
+      <h:outputText id="col4-txt" value="#{r['bpm:dueDate']}">
          <a:convertXMLDate type="both" pattern="#{msg.date_pattern}" />
       </h:outputText>
    </a:column>
    
    <%-- Status column --%>
-   <a:column style="text-align:left">
+   <a:column id="col5" style="text-align:left">
       <f:facet name="header">
-         <a:sortLink label="#{msg.status}" value="bpm:status" styleClass="header"/>
+         <a:sortLink id="col5-sort" label="#{msg.status}" value="bpm:status" styleClass="header"/>
       </f:facet>
-      <h:outputText value="#{r['bpm:status']}" />
+      <h:outputText id="col5-txt" value="#{r['bpm:status']}" />
    </a:column>
    
    <%-- Priority column --%>
-   <a:column style="text-align:left">
+   <a:column id="col6" style="text-align:left">
       <f:facet name="header">
-         <a:sortLink label="#{msg.priority}" value="bpm:priority" styleClass="header"/>
+         <a:sortLink id="col6-sort" label="#{msg.priority}" value="bpm:priority" styleClass="header"/>
       </f:facet>
-      <h:outputText value="#{r['bpm:priority']}" />
+      <h:outputText id="col6-txt" value="#{r['bpm:priority']}" />
    </a:column>
    
    <%-- Actions column --%>
-   <a:column actions="true" style="text-align:left">
+   <a:column id="col7" actions="true" style="text-align:left">
       <f:facet name="header">
-         <h:outputText value="#{msg.actions}"/>
+         <h:outputText id="col7-txt" value="#{msg.actions}"/>
       </f:facet>
-      <r:actions value="dashlet_todo_actions" context="#{r}" showLink="false" 
+      <r:actions id="col7-actions" value="dashlet_todo_actions" context="#{r}" showLink="false" 
                  styleClass="inlineAction" />
    </a:column>
    
-   <a:dataPager styleClass="pager" />
+   <a:dataPager id="pager" styleClass="pager" />
 </a:richList>
\ No newline at end of file
diff --git a/source/web/jsp/workflow/view-completed-task-dialog.jsp b/source/web/jsp/workflow/view-completed-task-dialog.jsp
index 6287762b9c..e93db93780 100644
--- a/source/web/jsp/workflow/view-completed-task-dialog.jsp
+++ b/source/web/jsp/workflow/view-completed-task-dialog.jsp
@@ -26,7 +26,7 @@
                        var="taskProps" columns="1" externalConfig="true" mode="view" />
 </a:panel>
 
-<h:outputText styleClass="paddingRow" value="&nbsp;" escape="false" />
+<h:outputText id="padding1" styleClass="paddingRow" value="&nbsp;" escape="false" />
 
 <a:panel id="resources-panel" label="#{msg.resources}"
          border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
@@ -38,61 +38,61 @@
                initialSortColumn="name" initialSortDescending="true">
       
       <%-- Name column --%>
-      <a:column primary="true" width="200" style="padding:2px; text-align:left">
+      <a:column id="col1" primary="true" width="200" style="padding:2px; text-align:left">
          <f:facet name="header">
-            <a:sortLink label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
+            <a:sortLink id="col1-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
          </f:facet>
          <f:facet name="small-icon">
-               <a:actionLink value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}" 
+               <a:actionLink id="col1-act1" value="#{r.name}" href="#{r.url}" target="new" image="#{r.fileType16}" 
                              showLink="false" styleClass="inlineAction" />
          </f:facet>
-         <a:actionLink value="#{r.name}" href="#{r.url}" target="new" />
-         <r:lockIcon value="#{r.nodeRef}" align="absmiddle" />
+         <a:actionLink id="col1-act2" value="#{r.name}" href="#{r.url}" target="new" />
+         <r:lockIcon id="col1-lock" value="#{r.nodeRef}" align="absmiddle" />
       </a:column>
       
       <%-- Description column --%>
-      <a:column style="text-align:left">
+      <a:column id="col2" style="text-align:left">
          <f:facet name="header">
-            <a:sortLink label="#{msg.description}" value="description" styleClass="header"/>
+            <a:sortLink id="col2-sort" label="#{msg.description}" value="description" styleClass="header"/>
          </f:facet>
-         <h:outputText value="#{r.description}" />
+         <h:outputText id="col2-txt" value="#{r.description}" />
       </a:column>
       
       <%-- Path column --%>
-      <a:column style="text-align:left">
+      <a:column id="col3" style="text-align:left">
          <f:facet name="header">
-            <a:sortLink label="#{msg.path}" value="path" styleClass="header"/>
+            <a:sortLink id="col3-sort" label="#{msg.path}" value="path" styleClass="header"/>
          </f:facet>
-         <r:nodePath value="#{r.path}" />
+         <r:nodePath id="col3-path" value="#{r.path}" />
       </a:column>
       
       <%-- Created Date column --%>
-      <a:column style="text-align:left">
+      <a:column id="col4" style="text-align:left">
          <f:facet name="header">
-            <a:sortLink label="#{msg.created}" value="created" styleClass="header"/>
+            <a:sortLink id="col4-sort" label="#{msg.created}" value="created" styleClass="header"/>
          </f:facet>
-         <h:outputText value="#{r.created}">
+         <h:outputText id="col4-txt" value="#{r.created}">
             <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
          </h:outputText>
       </a:column>
       
       <%-- Modified Date column --%>
-      <a:column style="text-align:left">
+      <a:column id="col5" style="text-align:left">
          <f:facet name="header">
-            <a:sortLink label="#{msg.modified}" value="modified" styleClass="header"/>
+            <a:sortLink id="col5-sort" label="#{msg.modified}" value="modified" styleClass="header"/>
          </f:facet>
-         <h:outputText value="#{r.modified}">
+         <h:outputText id="col5-txt" value="#{r.modified}">
             <a:convertXMLDate type="both" pattern="#{msg.date_time_pattern}" />
          </h:outputText>
       </a:column>
    </a:richList>   
 </a:panel>
 
-<h:outputText styleClass="paddingRow" value="&nbsp;" escape="false" />
+<h:outputText id="padding2" styleClass="paddingRow" value="&nbsp;" escape="false" />
 
 <a:panel id="workflow-summary-panel" label="#{msg.part_of_workflow}"
          border="white" bgcolor="white" titleBorder="blue" titleBgcolor="#D3E6FE" styleClass="mainSubTitle">
 
-   <r:workflowSummary value="#{DialogManager.bean.workflowInstance}" styleClass="workflowSummary" />
+   <r:workflowSummary id="workflow-summary" value="#{DialogManager.bean.workflowInstance}" styleClass="workflowSummary" />
 
 </a:panel>