diff --git a/includes/forms/form-OrderPaper.php b/includes/forms/form-OrderPaper.php
index acc43ea..435f864 100644
--- a/includes/forms/form-OrderPaper.php
+++ b/includes/forms/form-OrderPaper.php
@@ -26,8 +26,6 @@ if (class_exists('GF_Field')) {
 			$this->choices = $choices;
 		}
 
-
-
 		public function get_form_editor_field_title()
 		{
 			return esc_attr__('Commande de publications papier', 'txtdomain');
@@ -137,7 +135,6 @@ if (class_exists('GF_Field')) {
 		}
 
 
-
 		public function get_value_entry_list($value, $entry, $field_id, $columns, $form)
 		{
 			return __('Enter details to see delivery details', 'txtdomain');
diff --git a/includes/forms/template-form-order-paper.php b/includes/forms/template-form-order-paper.php
index fa0fe91..db4e310 100644
--- a/includes/forms/template-form-order-paper.php
+++ b/includes/forms/template-form-order-paper.php
@@ -7,13 +7,13 @@
 	?>
 	<?php foreach ($this->choices as $index => $brochurePost) : ?>
 		<div class=" gchoice brochure-order-field">
-			<label id='<?php echo  "field_" . $id . "_" . $index ?>' for="choice_18_18_1" class="gform-field-label gform-field-label--type-inline"><?php echo $brochurePost['text'] ?></label>
+			<legend class="brochure-legend gform-field-label gform-field-label--type-inline"><?php echo $brochurePost['text'] ?></legend>
 			<div class="publications-amount-fr">
-				<label id="publications-amount__label-fr" for="<?php echo 'input_' . $id . '[]' ?>">fr</label>
+				<label id="publications-amount__label-fr" for="<?php echo 'input_' . $id . '[]' ?>" title="<?php echo __("Quantité désiré de brochures en Français", "homegrade-theme__texte-fonctionnel") ?>">fr</label>
 				<input type="number" size="1" name="<?php echo 'input_' . $id . '[]' ?>" />
 			</div>
 			<div class="publications-amount publications-amount-nl">
-				<label id="publications-amount__label-nl" for="<?php echo 'input_' . $id . '[]' ?>">nl</label>
+				<label id="publications-amount__label-nl" for="<?php echo 'input_' . $id . '[]' ?>" title="<?php echo __("Quantité désiré de brochures en Néerlandais", "homegrade-theme__texte-fonctionnel") ?>">nl</label>
 				<input type="number" size="1" name="<?php echo 'input_' . $id . '[]' ?>" />
 			</div>
 		</div>
diff --git a/resources/css/components/forms.css b/resources/css/components/forms.css
index 76cab3e..4d2a1dc 100644
--- a/resources/css/components/forms.css
+++ b/resources/css/components/forms.css
@@ -65,7 +65,7 @@ form:not(.metabox-location-side):not(.metabox-location-normal):not(
       .gform-theme-button,
       .search-module__search-form__input
     ) {
-    @apply !rounded-lg !py-6;
+    @apply !rounded-lg py-6;
   }
   select {
     @apply !rounded-lg !h-12 !pt-3 !text-base;
@@ -78,10 +78,12 @@ form:not(.metabox-location-side):not(.metabox-location-normal):not(
   input[type='file'] {
     @apply !rounded-lg;
   }
-  label:not(.gform-field-label--type-sub):not(.gform-field-label--type-inline),
-  legend {
+  label:not(.gform-field-label--type-sub):not(.gform-field-label--type-inline) {
     @apply !font-bold !text-neutral-900 !text-lg;
   }
+  legend {
+    @apply font-bold !text-neutral-900 !text-lg;
+  }
   label {
     @apply !text-neutral-700 !text-base !font-medium;
   }
@@ -180,18 +182,22 @@ form:not(.metabox-location-side):not(.metabox-location-normal):not(
 } */
 
 .field-order-paper-publications {
-  @apply !grid !grid-cols-2 gap-x-12 gap-y-2;
+  @apply !grid md:grid-cols-2 gap-x-12 gap-y-2;
 
   .brochure-order-field {
     @apply flex justify-end gap-3 items-center;
-    label {
-      @apply block !mr-auto;
+    legend {
+      @apply block ml-0 pt-6 !mr-auto !font-normal;
+      font-weight: revert !important;
     }
 
     .publications-amount-fr,
     .publications-amount-nl {
-      input {
-        @apply h-2 !w-12;
+      label {
+        @apply block mx-auto;
+      }
+      input[type='number'] {
+        @apply h-2 !w-16 !py-5;
       }
       #publications-amount__label-nl,
       #publications-amount__label-fr {