diff --git a/public/themes/bootstrap/contact.php b/public/themes/bootstrap/contact.php
index 6d90bb9..904a709 100644
--- a/public/themes/bootstrap/contact.php
+++ b/public/themes/bootstrap/contact.php
@@ -16,7 +16,7 @@ include __DIR__ . "/inc/header.inc.php";
         </div>
     </div>
     <div class="container">
-        <form action="<?php get_site_url(); ?>/contact.php" method="POST">
+        <form action="<?php get_site_url(); ?>contact.php" method="POST">
             <div class="row">
                 <div class="col-12 col-md-6 mb-3">
                     <label for="name">Name</label>
@@ -31,6 +31,14 @@ include __DIR__ . "/inc/header.inc.php";
                     <textarea class="form-control" name="message" id="message" placeholder="" required ></textarea>
                 </div>
             </div>
+            <br />
+            <?php
+            $btn = get_complex_component("submit-btn", null, ["icon", "link"]);
+            $text = $btn['text'];
+            ?>
+            <button type="submit" class="btn btn-primary sw-complex" data-json="<?php echo get_escaped_json($btn); ?>" data-component="submit-btn">
+                <?php echo $text; ?>
+            </button>
         </form>
     </div>
 </main>
diff --git a/public/themes/bootstrap/home.php b/public/themes/bootstrap/home.php
index 6ec8d80..12a26f0 100644
--- a/public/themes/bootstrap/home.php
+++ b/public/themes/bootstrap/home.php
@@ -11,7 +11,7 @@ include __DIR__ . "/inc/header.inc.php";
 <main role="main" class="mt-5">
     <div class="jumbotron">
         <div class="container">
-            <h1 class="display-4"><?php get_page_title(); ?></h1>
+            <h1 class="display-4 sw-text" data-component="banner-title"><?php get_component("banner-title"); ?></h1>
             <div class="ml-2 lead">
                 <div class="sw-text" data-component="lead">
                     <?php get_component("lead"); ?>
@@ -20,22 +20,28 @@ include __DIR__ . "/inc/header.inc.php";
         </div>
     </div>
     <div class="container">
-        <div class="row">
-            <div class="col-md-4">
+        <div class="row justify-content-center">
+            <?php if (!is_component_empty("cardrow-1")) { ?>
+            <div class="col-md">
                 <div class="sw-editable" data-component="cardrow-1">
                     <?php get_component("cardrow-1"); ?>
                 </div>
             </div>
-            <div class="col-md-4">
+            <?php } ?>
+            <?php if (!is_component_empty("cardrow-2")) { ?>
+            <div class="col-md">
                 <div class="sw-editable" data-component="cardrow-2">
                     <?php get_component("cardrow-2"); ?>
                 </div>
             </div>
-            <div class="col-md-4">
+            <?php } ?>
+            <?php if (!is_component_empty("cardrow-3")) { ?>
+            <div class="col-md">
                 <div class="sw-editable" data-component="cardrow-3">
                     <?php get_component("cardrow-3"); ?>
                 </div>
             </div>
+            <?php } ?>
         </div>
     </div>
 </main>