diff --git a/ckanext/odsh/templates/macros/form.html b/ckanext/odsh/templates/macros/form.html
index 862c69eee75b6e20effeb981da4e4287fec103c3..5cd97c690c3a28e0af88db0757287fa341f49b30 100644
--- a/ckanext/odsh/templates/macros/form.html
+++ b/ckanext/odsh/templates/macros/form.html
@@ -366,12 +366,17 @@ is_required=is_required) %}
 {% macro input_address(field, label, value='', index='', placeholder='', type='text', attrs={}) %}
 {%- set _type = 'text' if type=='date' and not value else type -%}
 {%- set onFocus = 'onfocus=(this.type=\'date\')' if type=='date' and not value else '' -%}
-<div class="row-fluid">
-    <div class="span6">
-    <label class="address-label"> {{ label }} </label>
-    <input id="field-{{field}}-key" type="hidden" name="extras__{{index}}__key" value="{{field}}"  />
-    <input id="field-{{field}}-value" type="{{_type}}" name="extras__{{index}}__value" value="{{value | empty_and_escape }}" placeholder="{{ placeholder }}" {{ onFocus }} {{ attributes(attrs) }}/>
-</div>
+<div class="control-group control-full">
+	<label class="control-label" for="field-{{field}}-value">{{ label }}</label>
+	<div class="controls editor">
+		<div class="row-fluid">
+			<div class="span6">
+				<input id="field-{{field}}-key" type="hidden" name="extras__{{index}}__key" value="{{field}}"  />
+				<input id="field-{{field}}-value" type="{{_type}}" name="extras__{{index}}__value" value="{{value | empty_and_escape }}" placeholder="{{ placeholder }}" {{ onFocus }} {{ attributes(attrs) }}/>
+			</div>
+			<div class="span6 inline-error"></div>
+		</div>
+	</div>
 </div>
 {% endmacro %}