diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractRegistrationForm.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractRegistrationForm.java
index e604692220c57ffc8d88f5af5139972d49eafca3..a93ca3f53ed9bbefe493be61f1a590e1d087d6b2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractRegistrationForm.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/AbstractRegistrationForm.java
@@ -65,6 +65,14 @@ public abstract class AbstractRegistrationForm extends ContentPanel
 
     public static final int DEFAULT_FIELD_WIDTH = 500;
 
+    public static final int SECTION_LABEL_WIDTH = DEFAULT_LABEL_WIDTH + 9;
+
+    public static final int SECTION_FIELD_WIDTH = DEFAULT_FIELD_WIDTH;
+
+    public static final int SECTION_DEFAULT_FIELD_WIDTH = DEFAULT_FIELD_WIDTH - 15;
+
+    public static final int SECTION_WIDTH = SECTION_FIELD_WIDTH + SECTION_LABEL_WIDTH + 16;
+
     protected InfoBox infoBox;
 
     protected FormPanel formPanel;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/AttachmentFileUploadField.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/AttachmentFileUploadField.java
index 51148eec747190ca54c8ca25cae6186d30966069..de74ae233f470743706c2fa96928d38cbcd2558b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/AttachmentFileUploadField.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/file/AttachmentFileUploadField.java
@@ -89,10 +89,6 @@ public class AttachmentFileUploadField extends FileUploadField
     private static final class AttachmentsFileSet extends FieldSet
     {
 
-        private final int labelWidth;
-
-        private final int fieldWidth;
-
         private final FileUploadField fileUploadField;
 
         private VarcharField titleField;
@@ -102,8 +98,6 @@ public class AttachmentFileUploadField extends FileUploadField
         public AttachmentsFileSet(final IMessageProvider messageProvider,
                 FileUploadField fileUploadField)
         {
-            this.labelWidth = AbstractRegistrationForm.DEFAULT_LABEL_WIDTH;
-            this.fieldWidth = AbstractRegistrationForm.DEFAULT_FIELD_WIDTH;
             this.fileUploadField = fileUploadField;
             createForm(messageProvider);
         }
@@ -119,7 +113,7 @@ public class AttachmentFileUploadField extends FileUploadField
         {
             setHeading(messageProvider.getMessage(Dict.ATTACHMENT));
             setLayout(createFormLayout());
-            setWidth(labelWidth + fieldWidth + 3);
+            setWidth(AbstractRegistrationForm.SECTION_WIDTH);
             add(fileUploadField);
             add(descriptionField = new DescriptionField(messageProvider, false));
             add(titleField = createTitleField(messageProvider.getMessage(Dict.TITLE)));
@@ -128,8 +122,8 @@ public class AttachmentFileUploadField extends FileUploadField
         private final FormLayout createFormLayout()
         {
             final FormLayout formLayout = new FormLayout();
-            formLayout.setLabelWidth(labelWidth);
-            formLayout.setDefaultWidth(fieldWidth - 15);
+            formLayout.setLabelWidth(AbstractRegistrationForm.SECTION_LABEL_WIDTH);
+            formLayout.setDefaultWidth(AbstractRegistrationForm.SECTION_DEFAULT_FIELD_WIDTH);
             return formLayout;
         }
 
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java
index 97d011f74eb0d3fe2c1de4c32806cfe2ae107269..f1668903ac98d302baa9b340587ef11fe0bf5018 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/experiment/PropertiesEditor.java
@@ -115,7 +115,8 @@ abstract public class PropertiesEditor<T extends EntityType, S extends EntityTyp
         Map<String, String> result = new HashMap<String, String>();
         for (IEntityProperty p : properties)
         {
-            result.put(p.getPropertyType().getCode(), StringEscapeUtils.unescapeHtml(p.tryGetAsString()));
+            result.put(p.getPropertyType().getCode(), StringEscapeUtils.unescapeHtml(p
+                    .tryGetAsString()));
         }
         return result;
     }
@@ -231,14 +232,8 @@ abstract public class PropertiesEditor<T extends EntityType, S extends EntityTyp
     private static final class PropertiesSectionFileSet extends FieldSet
     {
 
-        private final int labelWidth;
-
-        private final int fieldWidth;
-
         public PropertiesSectionFileSet(final String sectionName)
         {
-            this.labelWidth = AbstractRegistrationForm.DEFAULT_LABEL_WIDTH;
-            this.fieldWidth = AbstractRegistrationForm.DEFAULT_FIELD_WIDTH;
             createForm(sectionName);
         }
 
@@ -246,14 +241,14 @@ abstract public class PropertiesEditor<T extends EntityType, S extends EntityTyp
         {
             setHeading(sectionName);
             setLayout(createFormLayout());
-            setWidth(labelWidth + fieldWidth + 3);
+            setWidth(AbstractRegistrationForm.SECTION_WIDTH);
         }
 
         private final FormLayout createFormLayout()
         {
             final FormLayout formLayout = new FormLayout();
-            formLayout.setLabelWidth(labelWidth);
-            formLayout.setDefaultWidth(fieldWidth - 15);
+            formLayout.setLabelWidth(AbstractRegistrationForm.SECTION_LABEL_WIDTH);
+            formLayout.setDefaultWidth(AbstractRegistrationForm.SECTION_DEFAULT_FIELD_WIDTH);
             return formLayout;
         }