diff --git a/themes/bs_bootstrap/sass/components/partials/_forms.scss b/themes/bs_bootstrap/sass/components/partials/_forms.scss
index 86178fd..5871ded 100644
--- a/themes/bs_bootstrap/sass/components/partials/_forms.scss
+++ b/themes/bs_bootstrap/sass/components/partials/_forms.scss
@@ -75,7 +75,6 @@ label {
   }
 
   &-actions {
-    margin-top: $spacer;
     margin-bottom: 2 * $spacer;
     // Align buttons and link action elements.
     display: flex;
@@ -111,17 +110,6 @@ label {
   }
 }
 
-fieldset {
-  // Fieldset is disabling vertical margin collapsing. Our fieldset have a
-  // form-group CSS class (which applies bottom margin). In the case of
-  // webform-composite-hidden-title we need to reset the fieldset
-  // bottom margin so we avoid double margin which is happening because we have
-  // the same bottom margin on child form-group elements.
-  &.webform-composite-hidden-title {
-    margin-bottom: 0;
-  }
-}
-
 // Description element - usually used for form descriptions.
 @include text-emphasis-variant('.description', $text-muted);
 .description {
diff --git a/themes/bs_bootstrap/sass/components/partials/_webform.scss b/themes/bs_bootstrap/sass/components/partials/_webform.scss
index e1fa953..a8d998e 100644
--- a/themes/bs_bootstrap/sass/components/partials/_webform.scss
+++ b/themes/bs_bootstrap/sass/components/partials/_webform.scss
@@ -6,3 +6,34 @@
     }
   }
 }
+
+// Webform webform.element.flexbox.css is resetting a bottom margin which does
+// not work for us.
+.webform-flex--container {
+  .form-group {
+    margin-bottom: $form-group-margin-bottom;
+  }
+}
+
+fieldset {
+  // Fieldset is disabling vertical margin collapsing. Our fieldset have a
+  // form-group CSS class (which applies bottom margin). In the case of
+  // webform-composite-hidden-title we need to reset the fieldset
+  // bottom margin so we avoid double margin which is happening because we have
+  // the same bottom margin on child form-group elements.
+  &.webform-composite-hidden-title {
+    margin-bottom: 0;
+  }
+
+  // For the last child in a fieldset we do need to reset bottom margin becase
+  // fieldset is disabling vertical margin collapsing.
+  .webform-flexbox {
+    &:last-child {
+      .webform-flex--container {
+        .form-group {
+          margin-bottom: 0;
+        }
+      }
+    }
+  }
+}
diff --git a/themes/bs_bootstrap/templates/form/captcha.html.twig b/themes/bs_bootstrap/templates/form/captcha.html.twig
new file mode 100755
index 0000000..c807b44
--- /dev/null
+++ b/themes/bs_bootstrap/templates/form/captcha.html.twig
@@ -0,0 +1,5 @@
+{% if details %}
+  {{ details }}
+{% else %}
+    <div class="captcha form-group form-item">{{ element }}</div>
+{% endif %}