diff --git a/source/web/jsp/wcm/create-website-wizard/form-templates.jsp b/source/web/jsp/wcm/create-website-wizard/form-templates.jsp
index b1c6fbac94..941e2da92e 100644
--- a/source/web/jsp/wcm/create-website-wizard/form-templates.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/form-templates.jsp
@@ -22,48 +22,48 @@
 <%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
 <%@ page isELIgnored="false" %>
 
-<h:panelGrid columns="1" cellpadding="2" cellpadding="2" width="100%">
+<h:panelGrid id="grid-1" columns="1" cellpadding="2" cellpadding="2" width="100%">
    <%-- Template selection list --%>
-   <h:outputText styleClass="mainSubText" value="#{msg.website_select_templates}:" />
-   <h:panelGroup>
+   <h:outputText id="msg-select" styleClass="mainSubText" value="#{msg.website_select_templates}:" />
+   <h:panelGroup id="grp-0">
       <a:selectList id="template-list" activeSelect="true" styleClass="selectListTable" itemStyleClass="selectListItem">
-         <a:listItems value="#{DialogManager.bean.templatesList}" />
-         <h:commandButton value="#{msg.add_to_list_button}" styleClass="dialogControls" actionListener="#{DialogManager.bean.addTemplate}" />
+         <a:listItems id="items1" value="#{DialogManager.bean.templatesList}" />
+         <h:commandButton id="cmd-add" value="#{msg.add_to_list_button}" styleClass="dialogControls" actionListener="#{DialogManager.bean.addTemplate}" />
       </a:selectList>
    </h:panelGroup>
    
    <f:verbatim><div style='padding:4px'></div></f:verbatim>
-   <h:outputText styleClass="mainSubText" value="#{msg.website_selected_templates}:" />
+   <h:outputText id="msg-selected" styleClass="mainSubText" value="#{msg.website_selected_templates}:" />
    
-   <h:panelGroup rendered="#{DialogManager.bean.templatesDataModel.rowCount != 0}">
-      <h:panelGrid columns="2" cellspacing="2" width="100%">
-         <h:dataTable value="#{DialogManager.bean.templatesDataModel}" var="row" 
+   <h:panelGroup id="grp-1" rendered="#{DialogManager.bean.templatesDataModel.rowCount != 0}">
+      <h:panelGrid id="grid-2" columns="2" cellspacing="2" width="100%">
+         <h:dataTable id="templates" value="#{DialogManager.bean.templatesDataModel}" var="row" 
                       rowClasses="selectedItemsRow,selectedItemsRowAlt"
                       styleClass="selectedItems" headerClass="selectedItemsHeader"
                       cellspacing="0" cellpadding="4" width="100%">
-            <h:column>
+            <h:column id="col1">
                <f:facet name="header">
-                  <h:outputText value="#{msg.name}" />
+                  <h:outputText id="head-1" value="#{msg.name}" />
                </f:facet>
                <f:verbatim>
                   <img style="float:left" src="<%=request.getContextPath()%>/images/icons/template_large.gif" />
                </f:verbatim>
             </h:column>
-            <h:column>
-               <h:outputText value="#{row.title}" />
+            <h:column id="col2">
+               <h:outputText id="msg-01" value="#{row.title}" />
             </h:column>
             <h:column>
                <f:facet name="header">
-                  <h:outputText value="#{msg.output_path_pattern}" />
+                  <h:outputText id="head-2" value="#{msg.output_path_pattern}" />
                </f:facet>
-               <h:inputText value="#{row.outputPathPattern}" size="70" maxlength="1024" />
+               <h:inputText id="in-01" value="#{row.outputPathPattern}" size="70" maxlength="1024" />
             </h:column>
             <h:column>
-               <a:actionLink actionListener="#{DialogManager.bean.removeTemplate}" image="/images/icons/delete.gif"
+               <a:actionLink id="act-01" actionListener="#{DialogManager.bean.removeTemplate}" image="/images/icons/delete.gif"
                              value="#{msg.remove}" showLink="false" style="padding:4px" />
             </h:column>
          </h:dataTable>
-         <h:graphicImage value="/images/icons/Help_icon.gif" style="vertical-align:-20%;padding-left:8px;cursor:help" onclick="javascript:toggleOutputPathPatternHelp()" />
+         <h:graphicImage id="img-help" value="/images/icons/Help_icon.gif" style="vertical-align:-20%;padding-left:8px;cursor:help" onclick="javascript:toggleOutputPathPatternHelp()" />
       </h:panelGrid>
       <f:verbatim>
          <jsp:directive.include file="/jsp/wcm/output-path-pattern-help.jsp"/>
@@ -71,7 +71,7 @@
    </h:panelGroup>
    
    <a:panel id="no-items" rendered="#{DialogManager.bean.templatesDataModel.rowCount == 0}">
-      <h:panelGrid width="100%" columns="1" cellpadding="2"
+      <h:panelGrid id="grid-none" width="100%" columns="1" cellpadding="2"
             styleClass="selectedItems" rowClasses="selectedItemsHeader,selectedItemsRow">
          <h:outputText id="no-items-name" value="#{msg.name}" />
          <h:outputText styleClass="selectedItemsRow" id="no-items-msg" value="#{msg.no_selected_items}" />
diff --git a/source/web/jsp/wcm/create-website-wizard/form-workflow.jsp b/source/web/jsp/wcm/create-website-wizard/form-workflow.jsp
index 6de61b9091..89af0ec37a 100644
--- a/source/web/jsp/wcm/create-website-wizard/form-workflow.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/form-workflow.jsp
@@ -22,19 +22,19 @@
 <%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
 <%@ page isELIgnored="false" %>
 
-<h:panelGrid columns="1" cellpadding="2" cellpadding="2" width="100%">
+<h:panelGrid id="grid-1" columns="1" cellpadding="2" cellpadding="2" width="100%">
    <r:propertySheetGrid id="task-props" value="#{DialogManager.bean.workflowMetadataNode}" 
          var="taskProps" columns="1" externalConfig="true" />
 </h:panelGrid>
 
-<h:panelGroup rendered="#{DialogManager.bean.filenamePattern != null}">
-   <h:panelGrid columns="1" cellpadding="2" style="padding-top:4px;padding-bottom:4px;"
+<h:panelGroup id="grp-1" rendered="#{DialogManager.bean.filenamePattern != null}">
+   <h:panelGrid id="grid-2" columns="1" cellpadding="2" style="padding-top:4px;padding-bottom:4px;"
          width="100%" rowClasses="wizardSectionHeading">
-      <h:outputText value="&nbsp;#{msg.workflow_settings}" escape="false" />
+      <h:outputText id="msg-1" value="&nbsp;#{msg.workflow_settings}" escape="false" />
    </h:panelGrid>
    
-   <h:panelGrid columns="2" cellpadding="2" cellspacing="2" style="margin-left:16px">
-      <h:outputText value="&nbsp;#{msg.website_filename_match}" escape="false" />
-      <h:inputText value="#{DialogManager.bean.filenamePattern}" size="70" />
+   <h:panelGrid id="grid-3" columns="2" cellpadding="2" cellspacing="2" style="margin-left:16px">
+      <h:outputText id="msg-2" value="&nbsp;#{msg.website_filename_match}" escape="false" />
+      <h:inputText id="in-1" value="#{DialogManager.bean.filenamePattern}" size="70" />
    </h:panelGrid>
 </h:panelGroup>
diff --git a/source/web/jsp/wcm/create-website-wizard/forms.jsp b/source/web/jsp/wcm/create-website-wizard/forms.jsp
index f503750f0d..9fdb28146c 100644
--- a/source/web/jsp/wcm/create-website-wizard/forms.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/forms.jsp
@@ -22,80 +22,80 @@
 <%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
 <%@ page isELIgnored="false" %>
 
-<h:panelGrid columns="1" cellpadding="2" cellpadding="2" width="100%">
+<h:panelGrid id="grid-1" columns="1" cellpadding="2" cellpadding="2" width="100%">
    <%-- Form selection list - scrollable DIV area --%>
-   <h:outputText styleClass="mainSubText" value="#{msg.website_select_form}:" />
-   <h:panelGroup>
+   <h:outputText id="msg-select" styleClass="mainSubText" value="#{msg.website_select_form}:" />
+   <h:panelGroup id="grp-1">
       <f:verbatim><div style="height:144px;*height:148px;width:100%;overflow:auto" class='selectListTable'></f:verbatim>
       <a:selectList id="form-list" activeSelect="true" style="width:100%" itemStyleClass="selectListItem">
-         <a:listItems value="#{WizardManager.bean.formsList}" />
+         <a:listItems id="items1" value="#{WizardManager.bean.formsList}" />
          <h:commandButton value="#{msg.add_to_list_button}" styleClass="dialogControls" actionListener="#{WizardManager.bean.addForm}" />
       </a:selectList>
       <f:verbatim></div></f:verbatim>
    </h:panelGroup>
-   <h:commandButton value="#{msg.create_form}" style="margin:2px" styleClass="dialogControls" action="wizard:createForm" />
+   <h:commandButton id="cmd-create" value="#{msg.create_form}" style="margin:2px" styleClass="dialogControls" action="wizard:createForm" />
    
    <%-- Selected Form table, with configuration buttons and info text --%>
    <f:verbatim><div style='padding:4px'></div></f:verbatim>
-   <h:dataTable value="#{WizardManager.bean.formsDataModel}" var="row" 
+   <h:dataTable id="items" value="#{WizardManager.bean.formsDataModel}" var="row" 
                 rowClasses="selectedItemsRow,selectedItemsRowAlt"
                 styleClass="selectedItems" headerClass="selectedItemsHeader"
                 cellspacing="0" cellpadding="4" width="100%"
                 rendered="#{WizardManager.bean.formsDataModel.rowCount != 0}">
-      <h:column>
+      <h:column id="col1">
          <f:facet name="header">
-            <h:outputText value="#{msg.website_selected_forms}" />
+            <h:outputText id="head-1" value="#{msg.website_selected_forms}" />
          </f:facet>
          <f:verbatim>
             <img style="float:left" src="<%=request.getContextPath()%>/images/icons/webform_large.gif" />
          </f:verbatim>
-         <h:panelGrid columns="2" cellspacing="1">
-            <h:outputText value="#{msg.name}: " />
-            <h:outputText value="#{row.title}" />
+         <h:panelGrid id="grid-form" columns="2" cellspacing="1">
+            <h:outputText id="msg-01" value="#{msg.name}: " />
+            <h:outputText id="msg-02" value="#{row.title}" />
             
-            <h:outputText value="#{msg.description}: " />
-            <h:outputText style="font-style:italic" rendered="#{empty row.description}" value="#{msg.description_not_set}" />
-            <h:outputText rendered="#{!empty row.description}" value="#{row.description}" />
+            <h:outputText id="msg-03" value="#{msg.description}: " />
+            <h:outputText id="msg-04" style="font-style:italic" rendered="#{empty row.description}" value="#{msg.description_not_set}" />
+            <h:outputText id="msg-05" rendered="#{!empty row.description}" value="#{row.description}" />
             
-            <h:outputText value="#{msg.workflow}: " />
-            <h:panelGroup rendered="#{row.workflow != null}">
-               <h:outputText value="#{row.workflow.title}" />
-               <h:graphicImage url="/images/icons/warning.gif" style="padding:2px" width="16" height="16"
+            <h:outputText id="msg-06" value="#{msg.workflow}: " />
+            <h:panelGroup id="grp-01" rendered="#{row.workflow != null}">
+               <h:outputText id="msg-07" value="#{row.workflow.title}" />
+               <h:graphicImage id="img-01" url="/images/icons/warning.gif" style="padding:2px" width="16" height="16"
                   rendered="#{row.workflow.params == null}" title="#{msg.workflow_not_configured}" />
             </h:panelGroup>
-            <h:outputText rendered="#{row.workflow == null}" value="#{msg.workflow_not_set}" />
+            <h:outputText id="msg-08" rendered="#{row.workflow == null}" value="#{msg.workflow_not_set}" />
             
-            <h:outputText value="#{msg.output_path_pattern}: " />
-            <h:outputText value="#{row.outputPathPattern}" />
+            <h:outputText id="msg-09" value="#{msg.output_path_pattern}: " />
+            <h:outputText id="msg-10" value="#{row.outputPathPattern}" />
             
-            <h:outputText value="#{msg.rendering_engines_selected}: " />
-            <h:outputText rendered="#{row.templates == null}" value="0" />
-            <h:outputText rendered="#{row.templates != null}" value="#{row.templatesSize}" />
+            <h:outputText id="msg-11" value="#{msg.rendering_engines_selected}: " />
+            <h:outputText id="msg-12" rendered="#{row.templates == null}" value="0" />
+            <h:outputText id="msg-13" rendered="#{row.templates != null}" value="#{row.templatesSize}" />
          </h:panelGrid>
       </h:column>
-      <h:column>
+      <h:column id="col2">
          <f:facet name="header">
-            <h:outputText value="#{msg.actions}" />
+            <h:outputText id="head-2" value="#{msg.actions}" />
          </f:facet>
-         <h:panelGrid columns="1" cellspacing="2" rendered="#{WizardManager.bean.editMode == false}">
+         <h:panelGrid id="grid-3" columns="1" cellspacing="2" rendered="#{WizardManager.bean.editMode == false}">
             <h:commandButton id="cmd1-1" value="#{msg.form_template_details}" styleClass="dialogControls" action="dialog:formTemplateDetails" actionListener="#{WizardManager.bean.setupFormAction}" />
             <h:commandButton id="cmd1-2" value="#{msg.form_template_conf_workflow}" styleClass="dialogControls" action="dialog:formTemplateWorkflow" actionListener="#{WizardManager.bean.setupFormAction}" disabled="#{row.workflow == null}" />
             <h:commandButton id="cmd1-3" value="#{msg.form_template_select_templates}" styleClass="dialogControls" action="dialog:formTemplateTemplates" actionListener="#{WizardManager.bean.setupFormAction}" />
          </h:panelGrid>
-         <h:panelGrid columns="1" cellspacing="2" rendered="#{WizardManager.bean.editMode == true}">
+         <h:panelGrid id="grid-4" columns="1" cellspacing="2" rendered="#{WizardManager.bean.editMode == true}">
             <h:commandButton id="cmd2-1" value="#{msg.form_template_details}" styleClass="dialogControls" action="dialog:editFormTemplateDetails" actionListener="#{WizardManager.bean.setupFormAction}" />
             <h:commandButton id="cmd2-2" value="#{msg.form_template_conf_workflow}" styleClass="dialogControls" action="dialog:editFormTemplateWorkflow" actionListener="#{WizardManager.bean.setupFormAction}" disabled="#{row.workflow == null}" />
             <h:commandButton id="cmd2-3" value="#{msg.form_template_select_templates}" styleClass="dialogControls" action="dialog:editFormTemplateTemplates" actionListener="#{WizardManager.bean.setupFormAction}" />
          </h:panelGrid>
       </h:column>
       <h:column>
-         <a:actionLink actionListener="#{WizardManager.bean.removeForm}" image="/images/icons/delete.gif"
+         <a:actionLink id="act1" actionListener="#{WizardManager.bean.removeForm}" image="/images/icons/delete.gif"
                        value="#{msg.remove}" showLink="false" style="padding:4px" />
       </h:column>
    </h:dataTable>
    
    <a:panel id="no-items" rendered="#{WizardManager.bean.formsDataModel.rowCount == 0}">
-      <h:panelGrid width="100%" columns="1" cellpadding="2"
+      <h:panelGrid id="grid-none" width="100%" columns="1" cellpadding="2"
             styleClass="selectedItems" rowClasses="selectedItemsHeader,selectedItemsRow">
          <h:outputText id="no-items-name" value="#{msg.name}" />
          <h:outputText styleClass="selectedItemsRow" id="no-items-msg" value="#{msg.no_selected_items}" />
diff --git a/source/web/jsp/wcm/create-website-wizard/settings.jsp b/source/web/jsp/wcm/create-website-wizard/settings.jsp
index d6825ff532..31de2a2232 100644
--- a/source/web/jsp/wcm/create-website-wizard/settings.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/settings.jsp
@@ -22,13 +22,13 @@
 <%@ page buffer="32kb" contentType="text/html;charset=UTF-8" %>
 <%@ page isELIgnored="false" %>
 
-<h:panelGrid columns="1" cellpadding="2" cellpadding="2" width="100%">
+<h:panelGrid id="grid-1" columns="1" cellpadding="2" cellpadding="2" width="100%">
    <%-- Workflow selection list - scrollable DIV area --%>
-   <h:outputText styleClass="mainSubText" value="#{msg.website_select_workflows}:" />
-   <h:panelGroup>
+   <h:outputText id="msg-select" styleClass="mainSubText" value="#{msg.website_select_workflows}:" />
+   <h:panelGroup id="grp-1">
       <f:verbatim><div style="height:144px;*height:148px;width:100%;overflow:auto" class='selectListTable'></f:verbatim>
       <a:selectList id="workflow-list" activeSelect="true" style="width:100%" itemStyleClass="selectListItem">
-         <a:listItems value="#{WizardManager.bean.workflowList}" />
+         <a:listItems id="items1" value="#{WizardManager.bean.workflowList}" />
          <h:commandButton value="#{msg.add_to_list_button}" styleClass="dialogControls" actionListener="#{WizardManager.bean.addWorkflow}" />
       </a:selectList>
       <f:verbatim></div></f:verbatim>
@@ -36,37 +36,37 @@
    
    <%-- Selected Workflow table, with configuration buttons and info text --%>
    <f:verbatim><div style='padding:4px'></div></f:verbatim>
-   <h:outputText styleClass="mainSubText" value="#{msg.website_selected_workflows}:" />
-   <h:dataTable value="#{WizardManager.bean.workflowsDataModel}" var="row" 
+   <h:outputText id="msg-selected" styleClass="mainSubText" value="#{msg.website_selected_workflows}:" />
+   <h:dataTable id="items" value="#{WizardManager.bean.workflowsDataModel}" var="row" 
                 rowClasses="selectedItemsRow,selectedItemsRowAlt"
                 styleClass="selectedItems" headerClass="selectedItemsHeader"
                 cellspacing="0" cellpadding="4" width="100%"
                 rendered="#{WizardManager.bean.workflowsDataModel.rowCount != 0}">
-      <h:column>
+      <h:column id="col1">
          <f:facet name="header">
-            <h:outputText value="#{msg.name}" />
+            <h:outputText id="title-01" value="#{msg.name}" />
          </f:facet>
-         <h:outputText value="#{row.title}" />
-         <h:graphicImage url="/images/icons/warning.gif" style="padding:2px" width="16" height="16"
+         <h:outputText id="msg-01" value="#{row.title}" />
+         <h:graphicImage id="img-01"url="/images/icons/warning.gif" style="padding:2px" width="16" height="16"
                rendered="#{row.params == null}" title="#{msg.workflow_not_configured}" />
       </h:column>
-      <h:column>
+      <h:column id="col2">
          <f:facet name="header">
-            <h:outputText value="#{msg.configure}" />
+            <h:outputText id="title-02" value="#{msg.configure}" />
          </f:facet>
-         <h:outputText value="#{msg.website_filename_match}:" style="padding-right:4px" />
-         <h:outputText value="#{row.filenamePattern}" />
+         <h:outputText id="msg-02" value="#{msg.website_filename_match}:" style="padding-right:4px" />
+         <h:outputText id="msg-03" value="#{row.filenamePattern}" />
          <h:commandButton id="cmd-1" rendered="#{WizardManager.bean.editMode == false}" value="#{msg.form_template_conf_workflow}" style="margin-left:4px" styleClass="dialogControls" action="dialog:formTemplateWorkflow" actionListener="#{WizardManager.bean.setupWorkflowAction}" />
          <h:commandButton id="cmd-2" rendered="#{WizardManager.bean.editMode == true}" value="#{msg.form_template_conf_workflow}" style="margin-left:4px" styleClass="dialogControls" action="dialog:editFormTemplateWorkflow" actionListener="#{WizardManager.bean.setupWorkflowAction}" />
       </h:column>
-      <h:column>
-         <a:actionLink actionListener="#{WizardManager.bean.removeWorkflow}" image="/images/icons/delete.gif"
+      <h:column id="col3">
+         <a:actionLink id="act-01" actionListener="#{WizardManager.bean.removeWorkflow}" image="/images/icons/delete.gif"
                        value="#{msg.remove}" showLink="false" style="padding:4px" />
       </h:column>
    </h:dataTable>
    
    <a:panel id="no-items" rendered="#{WizardManager.bean.workflowsDataModel.rowCount == 0}">
-      <h:panelGrid columns="1" cellpadding="2" width="100%"
+      <h:panelGrid id="grid-2" columns="1" cellpadding="2" width="100%"
             styleClass="selectedItems" rowClasses="selectedItemsHeader,selectedItemsRow">
          <h:outputText id="no-items-name" value="#{msg.name}" />
          <h:outputText styleClass="selectedItemsRow" id="no-items-msg" value="#{msg.no_selected_items}" />