diff --git a/form-builder/jvm/src/main/resources/xbl/fb/dialog-help/dialog-help.xbl b/form-builder/jvm/src/main/resources/xbl/fb/dialog-help/dialog-help.xbl
index 907f74ff3c..94a3f66a9e 100644
--- a/form-builder/jvm/src/main/resources/xbl/fb/dialog-help/dialog-help.xbl
+++ b/form-builder/jvm/src/main/resources/xbl/fb/dialog-help/dialog-help.xbl
@@ -74,15 +74,15 @@
                     <xf:label ref="$resources/dialog-help/label"/>
 
                     <xh:div>
-                        <xh:div class="fr-grid">
-                            <xh:div class="fr-grid-content">
-                                <xf:group class="fb-hide-alert">
+                        <fr:grid class="fb-hide-alert">
+                            <xh:tr>
+                                <xh:td>
                                     <xf:textarea ref="$i/help" id="fb-edit-help-dialog-text">
                                         <xf:label ref="$resources/dialog-help/help-message/label"/>
                                     </xf:textarea>
-                                </xf:group>
-                            </xh:div>
-                        </xh:div>
+                                </xh:td>
+                            </xh:tr>
+                        </fr:grid>
                         <xh:div class="fr-dialog-buttons">
                             <xf:group id="triggers">
                                 <xf:trigger id="save-trigger" appearance="xxf:primary">
diff --git a/form-runner/jvm/src/main/assets/apps/fr/style/form-runner-base.less b/form-runner/jvm/src/main/assets/apps/fr/style/form-runner-base.less
index 3c3e0fe0f0..b9355cda10 100644
--- a/form-runner/jvm/src/main/assets/apps/fr/style/form-runner-base.less
+++ b/form-runner/jvm/src/main/assets/apps/fr/style/form-runner-base.less
@@ -335,7 +335,7 @@
 
         margin-bottom: 10px;    // otherwise buttons at the bottom touch the viewport
 
-        .fr-grid .fr-grid-tr .fr-grid-content {
+        .fr-grid .fr-grid-tr .fr-grid-td {
 
             // Custom control widths
             .fr-width-2em     input.xforms-input-input, .fr-width-2em select      { width: 2em }
@@ -374,10 +374,16 @@
 
     .xforms-form { // make rule a bit stronger to make sure hints are hidden
         .fr-mode-view, .fr-mode-pdf, .fr-mode-email {
-            .xforms-hint, .xforms-help, .xforms-alert { display: none }
+            .xforms-hint, .xforms-help, .xforms-alert {
+                display: none;
+            }
 
             // For those controls that still have a display: block in view mode, make sure there is no top margin
-            .fr-grid-content .xforms-control, .fr-grid-content .fr-component-group { margin-top: 0 }
+            .fr-grid-td .xforms-control,
+                .fr-grid-td .fr-component-group {
+                margin-top: 0;
+            }
+
             .fr-repeat-multiple-rows {
                 .fr-grid-master-row { display: none }       // Hide the top header row, as we don't need the space for the *add* icon in view mode
                 border-top: none;                           // Avoid double border at the top
diff --git a/form-runner/jvm/src/main/assets/xbl/orbeon/grid/grid.less b/form-runner/jvm/src/main/assets/xbl/orbeon/grid/grid.less
index de0a4d6638..9abb860853 100644
--- a/form-runner/jvm/src/main/assets/xbl/orbeon/grid/grid.less
+++ b/form-runner/jvm/src/main/assets/xbl/orbeon/grid/grid.less
@@ -177,7 +177,7 @@
             .xforms-mediatype-image img { display: block }
 
             //  Buttons
-            .fr-grid-content {
+            .fr-grid-td {
                 .xforms-trigger button, .xforms-trigger input { margin-top: 1.72em } // hand-tuned so it appears at about the same pos as input fields
                 .xforms-trigger button, .yui-button .xforms-trigger input { margin-top: 0 } // except YUI buttons don't appear right with top margin!
             }
diff --git a/src/main/resources/forms/orbeon/dmv-14/form/form.xhtml b/src/main/resources/forms/orbeon/dmv-14/form/form.xhtml
index 5c96f796ed..e6a950dff0 100644
--- a/src/main/resources/forms/orbeon/dmv-14/form/form.xhtml
+++ b/src/main/resources/forms/orbeon/dmv-14/form/form.xhtml
@@ -28,7 +28,7 @@
             .fr-grid .xforms-mediatype-image img {
                 margin: auto;
             }
-            .fr-grid-content .xforms-control, .fr-grid-content .fr-component-group, .fr-grid-content span.xbl-fr-us-state {
+            .fr-grid-td .xforms-control, .fr-grid-td .fr-component-group, .fr-grid-td span.xbl-fr-us-state {
                 display: inline-block; vertical-align: middle;
             }
         </xh:style>