diff --git a/scss/bootscore_woocommerce/_wc_checkout.scss b/scss/bootscore_woocommerce/_wc_checkout.scss
index efbabee0..af92bfcc 100644
--- a/scss/bootscore_woocommerce/_wc_checkout.scss
+++ b/scss/bootscore_woocommerce/_wc_checkout.scss
@@ -77,15 +77,24 @@ p.create-account {
     padding: 0;
     margin-bottom: $spacer;
 
+    &::after {
+      margin-top: $spacer;
+    }
+
     li {
       line-height: inherit;
+      padding-left: 0;
+      @extend .form-check;
 
       // Adjust payment method checkboxes
       input {
-        margin-top: ($line-height-base - $form-check-input-width) * .5;
+        @extend .form-check-input;
         margin-right: $form-check-input-width * .5;
+        margin-left: 0;
+      }
+
+      &:last-child div.payment_box {
         margin-bottom: 0;
-        margin-left: -$spacer * 1.5;
       }
     }
 
@@ -103,15 +112,21 @@ p.create-account {
         display: none;
       }
     }
+
+    // If no payment method is available
+    .woocommerce-info {
+      margin-bottom: 0;
+    }
   }
 
+
   // Policy & place-order wrapper
   div.form-row {
     padding: 0;
     margin: 0;
   }
 
-  // Place ordere button
+  // Place order button
   #place_order {
     @extend .btn-lg;
     width: 100%;
@@ -119,7 +134,7 @@ p.create-account {
   }
 }
 
-
+/*
 // Adjust terms checkboxes
 .woocommerce form .form-row .input-checkbox {
   margin-top: ($line-height-base - $form-check-input-width) * .5 !important;
@@ -127,6 +142,7 @@ p.create-account {
   margin-bottom: 0 !important;
   margin-left: -$spacer * 1.5 !important;
 }
+*/
 
 
 // Terms & conditions collapse box
@@ -185,8 +201,7 @@ p.create-account {
   }
 
   label {
-    cursor: pointer;
-    color: var(--bs-body-color) !important;
+    color: var(--#{$prefix}body-color) !important;
   }
 }
 
@@ -207,6 +222,7 @@ p.create-account {
 
 // Form Validation
 .woocommerce form .form-row {
+
   &.woocommerce-validated {
 
     .select2-container,
diff --git a/woocommerce/checkout/payment-method.php b/woocommerce/checkout/payment-method.php
deleted file mode 100644
index 09a5d852..00000000
--- a/woocommerce/checkout/payment-method.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Output a single payment method
- *
- * This template can be overridden by copying it to yourtheme/woocommerce/checkout/payment-method.php.
- *
- * HOWEVER, on occasion WooCommerce will need to update template files and you
- * (the theme developer) will need to copy the new files to your theme to
- * maintain compatibility. We try to do this as little as possible, but it does
- * happen. When this occurs the version of the template file will be bumped and
- * the readme will list any important changes.
- *
- * @see         https://docs.woocommerce.com/document/template-structure/
- * @package     WooCommerce/Templates
- * @version     3.5.0
- */
-
-if (!defined('ABSPATH')) {
-  exit;
-}
-?>
-<li class="list-unstyled wc_payment_method payment_method_<?php echo esc_attr($gateway->id); ?>">
-
-  <div class="form-check mb-3">
-    <input id="payment_method_<?php echo esc_attr($gateway->id); ?>" type="radio" class="input-radio form-check-input" name="payment_method" value="<?php echo esc_attr($gateway->id); ?>" <?php checked($gateway->chosen, true); ?> data-order_button_text="<?php echo esc_attr($gateway->order_button_text); ?>" />
-    <label class="form-check-label" for="payment_method_<?php echo esc_attr($gateway->id); ?>">
-      <?php echo $gateway->get_title(); /* phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped */ ?> <?php echo $gateway->get_icon(); /* phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped */ ?>
-    </label>
-  </div>
-
-  <?php if ($gateway->has_fields() || $gateway->get_description()) : ?>
-    <div class="payment_box payment_method_<?php echo esc_attr($gateway->id); ?>" <?php if (!$gateway->chosen) : /* phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace */ ?>style="display:none;" <?php endif; /* phpcs:ignore Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace */ ?>>
-      <?php $gateway->payment_fields(); ?>
-    </div>
-  <?php endif; ?>
-</li>
\ No newline at end of file