diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
index addff0e405..4de98b3809 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateWebsiteWizard.java
@@ -1280,7 +1280,7 @@ public class CreateWebsiteWizard extends BaseWizardBean
    {
       UISelectList selectList = (UISelectList)event.getComponent().findComponent(COMPONENT_FORMLIST);
       int index = selectList.getRowIndex();
-      if (index != -1)
+      if (index != -1 && index < this.formsList.size())
       {
          Form form = (Form)this.formsList.get(index).getValue();
          FormWrapper wrapper = new FormWrapper(form);
@@ -1437,9 +1437,12 @@ public class CreateWebsiteWizard extends BaseWizardBean
    {
       UISelectList selectList = (UISelectList)event.getComponent().findComponent(COMPONENT_WORKFLOWLIST);
       int index = selectList.getRowIndex();
-      if (index != -1)
+      
+      List<UIListItem> workflowsList = this.getWorkflowList();
+      
+      if (index != -1 && index < workflowsList.size())
       {
-         WorkflowDefinition workflow = (WorkflowDefinition)this.getWorkflowList().get(index).getValue();
+         WorkflowDefinition workflow = (WorkflowDefinition)workflowsList.get(index).getValue();
          this.workflows.add(new WorkflowWrapper(
                workflow.getName(), workflow.getTitle(), workflow.getDescription(), MATCH_DEFAULT));
       }
diff --git a/source/web/jsp/content/edit-content-properties.jsp b/source/web/jsp/content/edit-content-properties.jsp
index 9c3cedb5f4..bb16a0044d 100644
--- a/source/web/jsp/content/edit-content-properties.jsp
+++ b/source/web/jsp/content/edit-content-properties.jsp
@@ -27,10 +27,16 @@
 <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
-<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
-             width="100%" rowClasses="wizardSectionHeading">
+<f:verbatim>
+<table cellpadding="2" width="100%" style="padding-top: 4px; padding-bottom: 4px;">
+<tr class="wizardSectionHeading">
+<td>
+</f:verbatim>
    <h:outputText value="&nbsp;#{msg.properties}" escape="false" />
-</h:panelGrid>
+<f:verbatim></td>
+</tr>
+</table>
+</f:verbatim>
 
 <r:propertySheetGrid id="content-props" value="#{DialogManager.bean.editableNode}" 
                      var="editContentProps" columns="1" externalConfig="true" />
\ No newline at end of file
diff --git a/source/web/jsp/wcm/create-website-wizard/form-details.jsp b/source/web/jsp/wcm/create-website-wizard/form-details.jsp
index c558df3e90..8e581d083d 100644
--- a/source/web/jsp/wcm/create-website-wizard/form-details.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/form-details.jsp
@@ -24,6 +24,7 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
@@ -54,7 +55,7 @@
 </script>
 </f:verbatim>
 
-<h:panelGrid columns="1" cellpadding="2" cellpadding="2" width="100%">
+<h:panelGrid columns="1" cellpadding="2" cellspacing="2" width="100%">
    <%-- Form properties --%>
    <h:panelGroup>
       <f:verbatim>
@@ -134,8 +135,6 @@
                <h:outputText value="#{msg.output_path_pattern}:"/>
                <f:verbatim>
                </nobr>
-            </td>
-            <td>
                </f:verbatim>
                <h:inputText id="filepattern" value="#{DialogManager.bean.outputPathPattern}" size="70" maxlength="1024" onchange="javascript:checkDisabledState();" onkeyup="javascript:checkDisabledState();" />
                <h:graphicImage value="/images/icons/Help_icon.gif" style="vertical-align:-20%;padding-left:8px;cursor:help" onclick="javascript:toggleOutputPathPatternHelp()" />
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 f98590c005..bf660c9ef6 100644
--- a/source/web/jsp/wcm/create-website-wizard/form-templates.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/form-templates.jsp
@@ -24,6 +24,7 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="/WEB-INF/alfresco.tld" prefix="a" %>
 <%@ taglib uri="/WEB-INF/repo.tld" prefix="r" %>
 
@@ -92,7 +93,7 @@
 </script>
 </f:verbatim>
 
-<h:panelGrid id="grid-1" columns="1" cellpadding="2" cellpadding="2" width="100%">
+<h:panelGrid id="grid-1" columns="1" cellpadding="2" cellspacing="2" width="100%">
    <%-- Template selection list --%>
    <h:outputText id="msg-select" styleClass="mainSubText" value="#{msg.website_select_templates}:" />
    <h:panelGroup id="grp-0">