diff --git a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
index 7a478a0d2d..914189a8a6 100644
--- a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
+++ b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
@@ -349,6 +349,15 @@ public class SubmitDialog extends BaseDialogBean
 
              String submitLabel = this.label;
              String submitComment = this.comment;
+             // crop to maximum length
+             if (submitLabel != null && submitLabel.length() > 255)
+             {
+                 submitLabel = submitLabel.substring(0, 255);
+             }
+             if (submitComment != null && submitComment.length() > 255)
+             {
+                 submitComment = submitComment.substring(0, 255);
+             }
 
              // note: always submit via workflow (if no workflow selected, then defaults to direct submit workflow)
              getSandboxService().submitListAssets(sbStoreId, relativePaths,
diff --git a/source/java/org/alfresco/web/ui/common/Utils.java b/source/java/org/alfresco/web/ui/common/Utils.java
index bf697ab44e..eaed64ff9b 100644
--- a/source/java/org/alfresco/web/ui/common/Utils.java
+++ b/source/java/org/alfresco/web/ui/common/Utils.java
@@ -568,11 +568,11 @@ public final class Utils extends StringUtils
       if (alt != null)
       {
          alt = Utils.encode(alt);
-         buf.append(" alt='")
+         buf.append(" alt=\"")
             .append(alt)
-            .append("' title='")
+            .append("\" title=\"")
             .append(alt)
-            .append("'");
+            .append("\"");
       }
       else
       {
@@ -653,11 +653,11 @@ public final class Utils extends StringUtils
       if (alt != null)
       {
          alt = Utils.encode(alt);
-         buf.append(" alt='")
+         buf.append(" alt=\"")
             .append(alt)
-            .append("' title='")
+            .append("\" title=\"")
             .append(alt)
-            .append("'");
+            .append('"');
       }
       else
       {
diff --git a/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java
index cc0be349f3..a02fd1f455 100644
--- a/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java
+++ b/source/java/org/alfresco/web/ui/common/renderer/ActionLinkRenderer.java
@@ -270,9 +270,9 @@ public class ActionLinkRenderer extends BaseRenderer
       }
       if (link.getTooltip() != null)
       {
-         out.write(" title='");
+         out.write(" title=\"");
          out.write(Utils.encode(link.getTooltip()));
-         out.write("'");
+         out.write('"');
       }
       out.write('>');
    }
diff --git a/source/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioRenderer.java b/source/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioRenderer.java
index 315525ce50..390429e3c4 100644
--- a/source/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioRenderer.java
+++ b/source/java/org/alfresco/web/ui/common/renderer/ImagePickerRadioRenderer.java
@@ -311,9 +311,9 @@ public class ImagePickerRadioRenderer extends BaseRenderer
       
       if (tooltip != null)
       {
-         out.write(" title='");
+         out.write(" title=\"");
          out.write(Utils.encode(tooltip));
-         out.write("'");
+         out.write('"');
       }
       
       if (onclick != null)
@@ -323,11 +323,6 @@ public class ImagePickerRadioRenderer extends BaseRenderer
          out.write("'");
       }
       
-//            if (item.isDisabled())
-//            {
-//               out.write(" disabled='true'");
-//            }
-      
       out.write(">");
       out.write("</td><td align='center'>");
   
diff --git a/source/web/jsp/browse/browse.jsp b/source/web/jsp/browse/browse.jsp
index 8b6c12d777..519d401eb7 100644
--- a/source/web/jsp/browse/browse.jsp
+++ b/source/web/jsp/browse/browse.jsp
@@ -262,7 +262,7 @@
                         </f:facet>
                         
                         <%-- Primary column for details view mode --%>
-                        <a:column id="col1" primary="true" width="200" style="padding:2px;text-align:left" rendered="#{BrowseBean.browseViewMode == 'details'}">
+                        <a:column id="col1" primary="true" style="padding:2px;text-align:left" rendered="#{BrowseBean.browseViewMode == 'details'}">
                            <f:facet name="header">
                               <a:sortLink id="col1-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
                            </f:facet>
@@ -409,7 +409,7 @@
                         </f:facet>
                         
                         <%-- Primary column for details view mode --%>
-                        <a:column id="col10" primary="true" width="200" style="padding:2px;text-align:left" rendered="#{BrowseBean.browseViewMode == 'details'}">
+                        <a:column id="col10" primary="true" style="padding:2px;text-align:left" rendered="#{BrowseBean.browseViewMode == 'details'}">
                            <f:facet name="header">
                               <a:sortLink id="col10-sort" label="#{msg.name}" value="name" mode="case-insensitive" styleClass="header"/>
                            </f:facet>
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 f6d5cfecf6..eefc3a783b 100644
--- a/source/web/jsp/wcm/create-website-wizard/form-workflow.jsp
+++ b/source/web/jsp/wcm/create-website-wizard/form-workflow.jsp
@@ -43,6 +43,6 @@
    
    <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:inputText id="in-1" value="#{DialogManager.bean.filenamePattern}" maxlength="1024" size="70" />
    </h:panelGrid>
-</h:panelGroup>
+</h:panelGroup>
\ No newline at end of file
diff --git a/source/web/jsp/wcm/submit-dialog.jsp b/source/web/jsp/wcm/submit-dialog.jsp
index f8388a5227..cc6ae62a3f 100644
--- a/source/web/jsp/wcm/submit-dialog.jsp
+++ b/source/web/jsp/wcm/submit-dialog.jsp
@@ -81,7 +81,7 @@
    
    <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
    <h:outputText value="#{msg.submit_snapshotlabel}:"/>
-   <h:inputText id="label" value="#{DialogManager.bean.label}" maxlength="1024" size="35"
+   <h:inputText id="label" value="#{DialogManager.bean.label}" maxlength="255" size="35"
         onkeyup="javascript:checkButtonState();" />
    <h:graphicImage value="/images/icons/required_field.gif" alt="#{msg.required_field}" />
    <h:outputText value="#{msg.submit_comment}:"/>
diff --git a/source/web/scripts/ajax/common.js b/source/web/scripts/ajax/common.js
index f1b23af5e2..e5fb426a38 100644
--- a/source/web/scripts/ajax/common.js
+++ b/source/web/scripts/ajax/common.js
@@ -209,7 +209,7 @@ function onlyDigits(e)
    var keychar = String.fromCharCode(keycode);
    var numcheck = /\d/;
    var dialogForm = $('dialog');
-   if (dialogForm && keyCode == 13)
+   if (dialogForm && keycode == 13)
    { 
       dialogForm.setProperty('onsubmit', 'return false;');
    }