diff --git a/config/alfresco/web-client-config-properties.xml b/config/alfresco/web-client-config-properties.xml
index 3aff50eb6b..4e8cb39eea 100644
--- a/config/alfresco/web-client-config-properties.xml
+++ b/config/alfresco/web-client-config-properties.xml
@@ -155,6 +155,7 @@
          <show-property name="title" component-generator="TextFieldGenerator" />
          <show-property name="description" component-generator="TextAreaGenerator" />
          <show-property name="destination" converter="org.alfresco.faces.DisplayPathConverter"/>
+         <show-property name="app:icon" show-in-view-mode="false" show-in-edit-mode="false" />
       </property-sheet>
    </config>
    
diff --git a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
index 03dac5f4cf..40f6c513df 100644
--- a/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
+++ b/source/java/org/alfresco/web/bean/wcm/CreateWebContentWizard.java
@@ -80,7 +80,6 @@ import org.alfresco.web.ui.common.Utils;
 import org.alfresco.web.ui.common.component.UIListItem;
 import org.alfresco.web.ui.wcm.component.UIUserSandboxes;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.w3c.dom.Document;
@@ -900,10 +899,7 @@ public class CreateWebContentWizard extends CreateContentWizard
 
    public String getFormDescriptionAttribute()
    {
-       if (StringUtils.isEmpty(this.formDescriptionAttribute))
-       {
-           this.formDescriptionAttribute = buildFormDescriptionAttribute();
-       }
+       this.formDescriptionAttribute = buildFormDescriptionAttribute();
        return this.formDescriptionAttribute;
    }
    
diff --git a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
index 5815d61d53..b1cd9f4777 100644
--- a/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
+++ b/source/java/org/alfresco/web/forms/xforms/Schema2XForms.java
@@ -1289,7 +1289,8 @@ public class Schema2XForms implements Serializable
                                                               elementDecl,
                                                               compatibleTypes,
                                                               pathToRoot,
-                                                              resourceBundle);
+                                                              resourceBundle,
+                                                              occurs);
          }
       }
 
@@ -1342,7 +1343,8 @@ public class Schema2XForms implements Serializable
                                                          final XSElementDeclaration elementDecl,
                                                          final TreeSet<XSTypeDefinition> compatibleTypes,
                                                          final String pathToRoot,
-                                                         final ResourceBundle resourceBundle)
+                                                         final ResourceBundle resourceBundle,
+                                                         final SchemaUtil.Occurrence occurs)
       throws FormBuilderException
    {
       // look for compatible types
@@ -1364,14 +1366,18 @@ public class Schema2XForms implements Serializable
       // multiple compatible types for this element exist
       // in the schema - allow the user to choose from
       // between compatible non-abstract types
+      boolean isRepeated = isRepeated(occurs, controlType);
       Element bindElement = this.createBind(xformsDocument, pathToRoot + "/@xsi:type");
       String bindId = bindElement.getAttributeNS(null, "id");
       modelSection.appendChild(bindElement);
+      this.startBindElement(bindElement, schema, controlType, null, occurs);
 
       //add the "element" bind, in addition
-      final Element bindElement2 = this.createBind(xformsDocument, pathToRoot);
+      final Element bindElement2 = this.createBind(xformsDocument, 
+                  pathToRoot + (isRepeated ? "[position() != last()]" : ""));
       final String bindId2 = bindElement2.getAttributeNS(null, "id");
       modelSection.appendChild(bindElement2);
+      this.startBindElement(bindElement2, schema, controlType, null, occurs);
 
       // add content to select1
       final Map<String, Element> caseTypes =
diff --git a/source/web/jsp/content/edit-link-properties.jsp b/source/web/jsp/content/edit-link-properties.jsp
index 3ad55dada7..7752af5fcf 100644
--- a/source/web/jsp/content/edit-link-properties.jsp
+++ b/source/web/jsp/content/edit-link-properties.jsp
@@ -24,53 +24,16 @@
 --%>
 <%@ 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" %>
 
-<f:verbatim>
-<script type="text/javascript">
-function checkButtonState()
-{
-if (document.getElementById("dialog:dialog-body:file-name").value.length == 0)
-{
-document.getElementById("dialog:finish-button").disabled = true;
-}
-else
-{
-document.getElementById("dialog:finish-button").disabled = false;
-}
-}
-</script>
+<h:panelGrid columns="1" cellpadding="2" style="padding-top: 4px; padding-bottom: 4px;"
+             width="100%" rowClasses="wizardSectionHeading">
+   <h:outputText value="&nbsp;#{msg.link_properties}" escape="false" />
+</h:panelGrid>
+
+<r:propertySheetGrid id="link-props" value="#{DialogManager.bean.editableNode}"
+                     var="editLinkProps" columns="1" externalConfig="true" />
+
+
 
-<table cellpadding="2" cellspacing="2" border="0" width="100%">
-<tr>
-<td colspan="2" class="wizardSectionHeading"></f:verbatim><h:outputText value="#{msg.link_properties}" /><f:verbatim></td>
-</tr>
-<tr><td colspan="2" class="paddingRow"></td></tr>
-<tr>
-<td><nobr></f:verbatim><h:outputText value="#{msg.file_name}" /><f:verbatim>:</nobr></td>
-<td width="90%">
-</f:verbatim><h:inputText id="file-name" value="#{DialogManager.bean.properties.name}" size="35" maxlength="1024"
-onkeyup="javascript:checkButtonState();" /><f:verbatim>&nbsp;*
-</td>
-</tr>
-<tr>
-<td><nobr></f:verbatim><h:outputText value="#{msg.title}" /><f:verbatim>:</nobr></td>
-<td>
-</f:verbatim><h:inputText id="title" value="#{DialogManager.bean.properties.title}" size="35" maxlength="1024" /><f:verbatim>
-</td>
-</tr>
-<tr>
-<td><nobr></f:verbatim><h:outputText value="#{msg.description}" /><f:verbatim>:</nobr></td>
-<td>
-</f:verbatim><h:inputText value="#{DialogManager.bean.properties.description}" size="35" maxlength="1024" /><f:verbatim>
-</td>
-</tr>
-<tr>
-<td><nobr></f:verbatim><h:outputText value="#{msg.link_destination}" /><f:verbatim>:</nobr></td>
-<td>
-</f:verbatim><h:outputText value="#{DialogManager.bean.destinationPath}" /><f:verbatim>
-</td>
-</tr>
-</table></f:verbatim>
\ No newline at end of file