diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index 602885160ae..6fac2461065 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -1673,44 +1673,34 @@
 .openerp .oe_form_readonly .oe_form_readonly_hidden {
   display: none;
 }
-.openerp .oe_form .oe_form_field_text,
-.openerp .oe_form .oe_form_field_char {
+.openerp .oe_form .oe_form_field_text {
   width: 100%;
 }
-.openerp .oe_form .oe_form_inline {
-  width: auto;
-}
 .openerp .oe_form .oe_form_group_cell {
   line-height: 18px;
   padding: 2px;
   height: 20px;
 }
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_many2one,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_many2one input,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_char input,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_text textarea,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_email,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_email input,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_url,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_url input,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_float input,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_selection select,
-.openerp .oe_form .oe_form_group_cell > .oe_form_field_progressbar,
-.openerp .oe_form .oe_form_group_cell > span > .oe_datepicker_root,
-.openerp .oe_form .oe_form_group_cell > span > .oe_datepicker_root > input.oe_datepicker_master {
+.openerp .oe_form .oe_form_field_char input,
+.openerp .oe_form .oe_form_field_text textarea,
+.openerp .oe_form .oe_form_field_email input,
+.openerp .oe_form .oe_form_field_url input,
+.openerp .oe_form .oe_form_field_selection select {
+  width: inherit;
+}
+.openerp .oe_form .oe_form_field_many2one input {
   width: 100%;
 }
+.openerp .oe_form .oe_form_field_float input {
+  width: 100px;
+}
 .openerp .oe_form h1, .openerp .oe_form h2, .openerp .oe_form h3, .openerp .oe_form h4, .openerp .oe_form h5, .openerp .oe_form h6 {
   margin: 0 0 4px 0;
-  width: 55%;
 }
 .openerp .oe_form h1 input, .openerp .oe_form h2 input, .openerp .oe_form h3 input, .openerp .oe_form h4 input, .openerp .oe_form h5 input, .openerp .oe_form h6 input {
   height: inherit !important;
   font-size: inherit;
 }
-.openerp .oe_form h1 input {
-  width: 100%;
-}
 .openerp .oe_form .oe_form_label_help[for], .openerp .oe_form .oe_form_label[for] {
   font-weight: bold;
   white-space: nowrap;
@@ -1724,9 +1714,24 @@
   top: -4px;
   padding: 0 2px;
 }
-.openerp .oe_form textarea {
+.openerp .oe_form .oe_form_field_text textarea {
   resize: vertical;
+}
+.openerp .oe_form .oe_form_field_many2one,
+.openerp .oe_form .oe_form_field_char,
+.openerp .oe_form .oe_form_field_text,
+.openerp .oe_form .oe_form_field_email,
+.openerp .oe_form .oe_form_field_url,
+.openerp .oe_form .oe_form_field_selection,
+.openerp .oe_form .oe_form_field_reference {
   width: 100%;
+  display: inline-block;
+}
+.openerp .oe_form .oe_form_field_float {
+  width: 180px;
+}
+.openerp .oe_form .oe_form_inline {
+  width: auto;
 }
 .openerp .oe_form input[type="text"],
 .openerp .oe_form input[type="password"],
@@ -1878,6 +1883,9 @@
   line-height: 23px;
   margin-right: 0;
 }
+.openerp .oe_form .oe_form_title {
+  width: 65%;
+}
 .openerp .oe_form .oe_form_button_box {
   width: 200px;
   text-align: center;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index 84f8d541759..145ebabbeaa 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -1327,34 +1327,29 @@ $colour4: #8a89ba
     .oe_form
         .oe_form_field_text
             width: 100%
-        .oe_form_inline
-            width: auto
         .oe_form_group_cell
             line-height: 18px
             padding: 2px
             height: 20px
-        .oe_form_group_cell > .oe_form_field_many2one,
-        .oe_form_group_cell > .oe_form_field_many2one input,
-        .oe_form_group_cell > .oe_form_field_char input,
-        .oe_form_group_cell > .oe_form_field_text textarea,
-        .oe_form_group_cell > .oe_form_field_email,
-        .oe_form_group_cell > .oe_form_field_email input,
-        .oe_form_group_cell > .oe_form_field_url,
-        .oe_form_group_cell > .oe_form_field_url input,
-        .oe_form_group_cell > .oe_form_field_float input,
-        .oe_form_group_cell > .oe_form_field_selection select,
-        .oe_form_group_cell > .oe_form_field_progressbar,
-        .oe_form_group_cell > span > .oe_datepicker_root,
-        .oe_form_group_cell > span > .oe_datepicker_root > input.oe_datepicker_master
+
+        .oe_form_field_char input,
+        .oe_form_field_text textarea,
+        .oe_form_field_email input,
+        .oe_form_field_url input,
+        .oe_form_field_selection select
+            width: inherit
+
+        .oe_form_field_many2one input
             width: 100%
+
+        .oe_form_field_float input
+            width: 100px
+
         h1, h2, h3, h4, h5, h6
             margin: 0 0 4px 0
-            width: 55%
             input
                 height: inherit !important
                 font-size: inherit
-        h1 input
-            width: 100%
 
     // }}}
     // FormView.label {{{
@@ -1373,9 +1368,23 @@ $colour4: #8a89ba
     // }}}
     // FormView.fields {{{
     .oe_form
-        textarea
+        .oe_form_field_text textarea
             resize: vertical
+        .oe_form_field_many2one,
+        .oe_form_field_char,
+        .oe_form_field_text,
+        .oe_form_field_email,
+        .oe_form_field_url,
+        .oe_form_field_selection,
+        .oe_form_field_reference
             width: 100%
+            display: inline-block
+
+        .oe_form_field_float
+            width: 180px
+        .oe_form_inline
+            width: auto
+
         input[type="text"],
         input[type="password"],
         input[type="file"],
@@ -1502,6 +1511,8 @@ $colour4: #8a89ba
                     line-height: 23px
                     margin-right: 0
 
+        .oe_form_title
+            width: 65%
         .oe_form_button_box
             width: 200px
             text-align: center
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index be49faa1969..3930396410f 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -1832,6 +1832,7 @@ instance.web.form.ReinitializeFieldMixin =  {
 
 instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}, instance.web.form.ReinitializeFieldMixin, {
     template: 'FieldChar',
+    widget_class: 'oe_form_field_char',
     init: function (field_manager, node) {
         this._super(field_manager, node);
         this.password = this.node.attrs.password === 'True' || this.node.attrs.password === '1';
@@ -1936,6 +1937,7 @@ instance.web.form.FieldUrl = instance.web.form.FieldChar.extend({
 
 instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({
     is_field_number: true,
+    widget_class: 'oe_form_field_float',
     init: function (field_manager, node) {
         this._super(field_manager, node);
         this.set({'value': 0});
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 43871326267..9c3b0b9ef53 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -882,13 +882,12 @@
     </ul>
 </t>
 <t t-name="FieldChar">
-    <span class="oe_form_field_char">
+    <span t-att-class="widget.widget_class">
         <t  t-if="!widget.get('effective_readonly')">
             <input t-att-type="widget.password ? 'password' : 'text'"
                 t-att-id="widget.id_for_label"
                 t-att-tabindex="widget.node.attrs.tabindex"
                 t-att-autofocus="widget.node.attrs.autofocus"
-                class="field_char"
                 t-att-placeholder="widget.node.attrs.placeholder"
             /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
         </t>
@@ -1012,9 +1011,11 @@
 <t t-name="FieldReference">
     <table class="oe_form_field_reference oe_form" border="0" cellpadding="0" cellspacing="0">
     <tr>
-        <td t-attf-class="oe_form_frame_cell oe_form_selection oe_form_view_reference_selection">
+        <td t-attf-class="oe_form_frame_cell oe_form_selection">
+            <span t-attf-class="oe_form_view_reference_selection"/>
         </td>
-        <td t-attf-class="oe_form_frame_cell oe_form_many2one oe_form_view_reference_m2o" nowrap="true" style="display: none">
+        <td t-attf-class="oe_form_frame_cell oe_form_many2one" nowrap="true">
+            <span t-attf-class="oe_form_view_reference_m2o"/>
         </td>
     </tr>
     </table>