diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index 8b8b78b16..df92a9901 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -2402,6 +2402,7 @@ HTML;
 				case 'CustomFields':
 					$sHTMLValue .= '<div id="'.$iId.'_console_form">';
 					$sHTMLValue .= '<div id="'.$iId.'_field_set">';
+					$sHTMLValue .= '</div></div>';
 					$sHTMLValue .= '<div>'.$sReloadSpan.'</div>'; // No validation span for this one: it does handle its own validation!
 					$sHTMLValue .= "<input name=\"attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}\" type=\"hidden\" id=\"$iId\" value=\"\"/>\n";
 
diff --git a/css/backoffice/components/_field.scss b/css/backoffice/components/_field.scss
index 8f043c169..72aab705c 100644
--- a/css/backoffice/components/_field.scss
+++ b/css/backoffice/components/_field.scss
@@ -205,3 +205,7 @@ $ibo-field--value-decoration--spacing-x: 0.5rem !default;
 .multi_values {
   background-color: #c33;
 }
+
+ .form_field ~ .form_field {
+    margin-top: $ibo-field--sibling-spacing;
+ }
\ No newline at end of file
diff --git a/js/form_field.js b/js/form_field.js
index aca562252..712b775db 100644
--- a/js/form_field.js
+++ b/js/form_field.js
@@ -21,9 +21,8 @@ $(function()
 		{
 			var me = this;
 			
-			this.element
-			.addClass('form_field');
-		   
+			this.element.addClass('form_field');
+
 			this.element
 			.bind('set_validators', function(oEvent, oData){
 				oEvent.stopPropagation();
diff --git a/templates/base/components/field/layout.html.twig b/templates/base/components/field/layout.html.twig
index 5d32a6f2d..38480ca39 100644
--- a/templates/base/components/field/layout.html.twig
+++ b/templates/base/components/field/layout.html.twig
@@ -25,9 +25,7 @@
 >
     <div class="ibo-field--label">{{ oUIBlock.GetLabel()|raw }}</div>
     <div class="ibo-field--value" {% if oUIBlock.GetValueId() %}id="{{ oUIBlock.GetValueId() }}"{% endif %}>
-        {% for oSubBlock in oUIBlock.GetSubBlocks() %}
-            {{ render_block(oSubBlock, {aPage: aPage}) }}
-        {% endfor %}
+        {% for oSubBlock in oUIBlock.GetSubBlocks() %}{{ render_block(oSubBlock, {aPage: aPage}) }} {% endfor %}
     </div>
     {% if oUIBlock.GetComments() %}
         <div class="ibo-field--comments">{{ oUIBlock.GetComments()|raw }}</div>
diff --git a/templates/base/components/input/layout.html.twig b/templates/base/components/input/layout.html.twig
index dc0eeb774..1361a6abb 100644
--- a/templates/base/components/input/layout.html.twig
+++ b/templates/base/components/input/layout.html.twig
@@ -12,5 +12,4 @@
                 {% endfor %}
             {% endif %}
             {% if oUIBlock.GetPlaceHolder() %}  placeholder="{{ oUIBlock.GetPlaceHolder() }}" {% endif %}
-    >
-{% endblock %}
\ No newline at end of file
+    >{% endblock %}
\ No newline at end of file