diff --git a/src/main/resources/io/jenkins/plugins/designlibrary/Dialogs/index.jelly b/src/main/resources/io/jenkins/plugins/designlibrary/Dialogs/index.jelly
index dfd4c7b0..d9a53064 100644
--- a/src/main/resources/io/jenkins/plugins/designlibrary/Dialogs/index.jelly
+++ b/src/main/resources/io/jenkins/plugins/designlibrary/Dialogs/index.jelly
@@ -104,32 +104,15 @@
             <div class="jenkins-dialog__title">Order your ice cream</div>
             <div class="jenkins-dialog__contents">
               <div width="100%">
-                <div class="jenkins-form-item tr ">
-                  <div class="jenkins-form-label help-sibling">Name</div>
-                  <div class="setting-main">
-                    <input name="name" placeholder="" type="text" class="jenkins-input   " value=""/>
-                  </div>
-                  <div class="validation-error-area"></div>
-                </div>
-                <div class="jenkins-form-item tr ">
-                  <div class="jenkins-form-label help-sibling">Quantity</div>
-                  <div class="setting-main">
-                    <input min="1" max="9" name="quantity" type="number" class="jenkins-input  " value="1"/>
-                  </div>
-                  <div class="validation-error-area"></div>
-                </div>
-                <div class="jenkins-form-item tr ">
-                  <div class="jenkins-form-label help-sibling">Choose flavor</div>
-                  <div class="setting-main">
-                    <div class="jenkins-select">
-                      <select
-                        fillurl="${rootURL}/descriptorByName/io.jenkins.plugins.designlibrary.Dialogs/fillFlavorItems"
-                        name="_.flavor" class="jenkins-select__input select" value="">
-                      </select>
-                    </div>
-                  </div>
-                  <div class="validation-error-area"></div>
-                </div>
+                <f:entry title="${%Name}">
+                  <f:textbox name="name"/>
+                </f:entry>
+                <f:entry title="${%Quantity}">
+                  <f:number name="quantity" min="1" max="9"/>
+                </f:entry>
+                <f:entry title="${%Choose flavor}" class="jdl-dialog-form--last">
+                  <f:select field="flavor"/>
+                </f:entry>
               </div>
               <div class="jenkins-buttons-row jenkins-buttons-row--equal-width jenkins-dialog__buttons">
                 <button data-id="ok" type="submit" class="jenkins-button jenkins-button--primary ">Order</button>
diff --git a/src/main/resources/scss/components/_component-sample.scss b/src/main/resources/scss/components/_component-sample.scss
index 176294f4..97848f3a 100644
--- a/src/main/resources/scss/components/_component-sample.scss
+++ b/src/main/resources/scss/components/_component-sample.scss
@@ -35,10 +35,13 @@
   }
 
   .jenkins-form-item, .jenkins-search-container {
-    margin-bottom: 0;
     min-width: 300px;
   }
 
+  :nth-last-child(1 of .jenkins-form-item) {
+    margin-bottom: 0;
+  }
+  
   .repeated-container {
     min-width: 600px;
   }
diff --git a/src/main/resources/scss/pages/_dialogs.scss b/src/main/resources/scss/pages/_dialogs.scss
index afd551cd..5d633320 100644
--- a/src/main/resources/scss/pages/_dialogs.scss
+++ b/src/main/resources/scss/pages/_dialogs.scss
@@ -1,3 +1,7 @@
 #toggle-switch-formsubmit {
     width: 100%;
-}
\ No newline at end of file
+}
+
+.jdl-dialog-form--last {
+  margin-bottom: var(--section-padding) !important;
+}