diff --git a/skins/elastic/styles/widgets/forms.less b/skins/elastic/styles/widgets/forms.less
index 6c415de37..e7454b002 100644
--- a/skins/elastic/styles/widgets/forms.less
+++ b/skins/elastic/styles/widgets/forms.less
@@ -324,7 +324,7 @@ input.smart-upload {
@media screen and (max-width: @screen-width-bs-phone) {
.formcontent .text-only {
- .form-group {
+ .form-group:not(tr) {
margin-bottom: .25rem;
.col-form-label {
@@ -1180,7 +1180,10 @@ html.touch input.icon-checkbox + label {
}
}
-/* Remove outline on selects in Firefox */
+
+/*** General browser hacks ***/
+
+// Remove outline on selects in Firefox
@-moz-document url-prefix() {
select:-moz-focusring {
color: transparent !important;
@@ -1188,7 +1191,8 @@ html.touch input.icon-checkbox + label {
}
}
-/* Bootstrap style overrides */
+
+/*** Bootstrap style overrides ***/
.form-control, .form-control:focus {
color: @color-font;
diff --git a/skins/elastic/templates/includes/layout.html b/skins/elastic/templates/includes/layout.html
index 269aa7c19..5d8768d5a 100644
--- a/skins/elastic/templates/includes/layout.html
+++ b/skins/elastic/templates/includes/layout.html
@@ -13,7 +13,7 @@