diff --git a/scm-ui/ui-components/src/forms/AddEntryToTableField.tsx b/scm-ui/ui-components/src/forms/AddEntryToTableField.tsx
index 536bf772a2..d1e1b77cb6 100644
--- a/scm-ui/ui-components/src/forms/AddEntryToTableField.tsx
+++ b/scm-ui/ui-components/src/forms/AddEntryToTableField.tsx
@@ -37,7 +37,7 @@ class AddEntryToTableField extends React.Component<Props, State> {
   render() {
     const { disabled, buttonLabel, fieldLabel, errorMessage, helpText } = this.props;
     return (
-      <div className="field">
+      <>
         <InputField
           label={fieldLabel}
           errorMessage={errorMessage}
@@ -53,7 +53,7 @@ class AddEntryToTableField extends React.Component<Props, State> {
           action={this.addButtonClicked}
           disabled={disabled || this.state.entryToAdd === "" || !this.isValid()}
         />
-      </div>
+      </>
     );
   }
 
diff --git a/scm-ui/ui-webapp/src/admin/components/form/BaseUrlSettings.tsx b/scm-ui/ui-webapp/src/admin/components/form/BaseUrlSettings.tsx
index abf8f36fb0..debf78b507 100644
--- a/scm-ui/ui-webapp/src/admin/components/form/BaseUrlSettings.tsx
+++ b/scm-ui/ui-webapp/src/admin/components/form/BaseUrlSettings.tsx
@@ -25,8 +25,6 @@ class BaseUrlSettings extends React.Component<Props> {
               disabled={!hasUpdatePermission}
               helpText={t("help.baseUrlHelpText")}
             />
-          </div>
-          <div className="column is-half">
             <Checkbox
               checked={forceBaseUrl}
               label={t("base-url-settings.force-base-url")}