diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
index 80d3de078..4388ee98a 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/common/CommonDialogWindow.java
@@ -109,9 +109,15 @@ public class CommonDialogWindow extends Window implements Serializable {
     public void checkMandatoryTextField(final TextChangeEvent event, final AbstractTextField textfield) {
 
         if (StringUtils.isNotBlank(event.getText())) {
-            getRequiredFields().put(textfield.getCaption(), Boolean.TRUE);
+            if (StringUtils.isNotBlank(textfield.getCaption())) {
+                getRequiredFields().put(textfield.getCaption(), Boolean.TRUE);
+            }
+            getRequiredFields().put(textfield.getId(), Boolean.TRUE);
         } else {
-            getRequiredFields().put(textfield.getCaption(), Boolean.FALSE);
+            if (StringUtils.isNotBlank(textfield.getCaption())) {
+                getRequiredFields().put(textfield.getCaption(), Boolean.FALSE);
+            }
+            getRequiredFields().put(textfield.getId(), Boolean.FALSE);
         }
         checkMandatoryFields();
     }
@@ -189,7 +195,7 @@ public class CommonDialogWindow extends Window implements Serializable {
             ((AbstractOrderedLayout) content).setMargin(true);
         }
         if (content instanceof GridLayout) {
-            addStyleName("");
+            addStyleName("marginTop");
         }
 
         if (null != content) {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java
index 4d5579de0..4b97ce7dd 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/distributions/disttype/CreateUpdateDistSetTypeLayout.java
@@ -113,7 +113,6 @@ public class CreateUpdateDistSetTypeLayout extends CreateUpdateTypeLayout
         tagDesc = SPUIComponentProvider.getTextArea(i18n.get("textfield.description"), "",
                 ValoTheme.TEXTFIELD_TINY + " " + SPUIDefinitions.DIST_SET_TYPE_DESC, false, "",
                 i18n.get("textfield.description"), SPUILabelDefinitions.TEXT_AREA_MAX_LENGTH);
-
         tagDesc.setId(SPUIDefinitions.NEW_DISTRIBUTION_TYPE_DESC);
         tagDesc.setImmediate(true);
         tagDesc.setNullRepresentation("");
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
index 5913bc9d1..9bd3972f0 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/targettable/TargetAddUpdateWindowLayout.java
@@ -52,9 +52,6 @@ import com.vaadin.ui.themes.ValoTheme;
 
 /**
  * Add and Update Target.
- *
- *
- *
  */
 @SpringComponent
 @VaadinSessionScope
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponentIdProvider.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponentIdProvider.java
index 496bb5cb4..7a7d62b87 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponentIdProvider.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/SPUIComponentIdProvider.java
@@ -927,6 +927,11 @@ public final class SPUIComponentIdProvider {
      */
     public static final String UPLOAD_STATUS_POPUP_ID = "artifact.upload.status.popup.id";
 
+    /**
+     * Table multiselect for selecting DistType
+     */
+    public static final String SELECT_DIST_TYPE = "select-dist-type";
+
     /**
      * /* Private Constructor.
      */
diff --git a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss
index 602298766..bab6e5f2a 100644
--- a/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss
+++ b/hawkbit-ui/src/main/resources/VAADIN/themes/hawkbit/customstyles/popup-common.scss
@@ -54,7 +54,22 @@
   }
   
  .v-gridlayout .v-gridlayout-marginTop {
-  	padding-top: 20px !important;
+  	margin-top: 20px !important;
   }
   
+ .v-slot .v-slot-marginTop {
+  	margin-top: 20px !important;
+  }
+  
+ .v-gridlayout-marginTop {
+  	margin-top: 20px !important;
+  }
+  
+ .v-slot-marginTop {
+  	margin-top: 20px !important;
+  }
+  
+   .marginTop {
+  	margin-top: 20px !important;
+  }
 }