diff --git a/lib/themefunctions.php b/lib/themefunctions.php
index a12fa5c..e26f2d8 100644
--- a/lib/themefunctions.php
+++ b/lib/themefunctions.php
@@ -278,7 +278,7 @@ function get_navigation($currentpage = null, $classPrefix = "", $liclass = "", $
  * @param string $var
  */
 function output_conditional($content, $var) {
-    if ($var == "") {
+    if ($var == "" && !isset($_GET['edit'])) {
         return;
     }
     echo str_replace("[[VAR]]", $var, $content);
diff --git a/public/themes/bootstrap/home.php b/public/themes/bootstrap/home.php
index 12a26f0..528ce1a 100644
--- a/public/themes/bootstrap/home.php
+++ b/public/themes/bootstrap/home.php
@@ -21,27 +21,18 @@ include __DIR__ . "/inc/header.inc.php";
     </div>
     <div class="container">
         <div class="row justify-content-center">
-            <?php if (!is_component_empty("cardrow-1")) { ?>
+            <?php
+            for ($i = 1; $i <= 3; $i++) {
+                $content = <<<END
             <div class="col-md">
-                <div class="sw-editable" data-component="cardrow-1">
-                    <?php get_component("cardrow-1"); ?>
+                <div class="sw-editable" data-component="cardrow-$i">
+                    [[VAR]]
                 </div>
             </div>
-            <?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>
-            <?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 } ?>
+END;
+                output_conditional($content, get_component("cardrow-$i", null, false));
+            }
+            ?>
         </div>
     </div>
 </main>
diff --git a/public/themes/verti/home.php b/public/themes/verti/home.php
index 9e05def..40d33eb 100644
--- a/public/themes/verti/home.php
+++ b/public/themes/verti/home.php
@@ -64,40 +64,25 @@
                     if ($count > 0) {
                         $width = 12 / $count;
                     }
-                    ?>
-                    <?php if (!is_component_empty("cardrow-1")) { ?>
-                        <div class="<?php echo $width; ?>u 12u(medium)">
-                            <section class="box feature">
-                                <div class="inner">
-                                    <div class="sw-editable" data-component="cardrow-1">
-                                        <?php get_component("cardrow-1"); ?>
-                                    </div>
-                                </div>
-                            </section>
-                        </div>
-                    <?php } ?>
-                    <?php if (!is_component_empty("cardrow-2")) { ?>
-                        <div class="<?php echo $width; ?>u 12u(medium)">
-                            <section class="box feature">
-                                <div class="inner">
-                                    <div class="sw-editable" data-component="cardrow-2">
-                                        <?php get_component("cardrow-2"); ?>
-                                    </div>
-                                </div>
-                            </section>
-                        </div>
-                    <?php } ?>
-                    <?php if (!is_component_empty("cardrow-3")) { ?>
-                        <div class="<?php echo $width; ?>u 12u(medium)">
+
+
+                    for ($i = 1; $i <= 3; $i++) {
+                        $w = $width . "u";
+                        $content = <<<END
+                        <div class="$w 12u(medium)">
                             <section class="box feature">
                                 <div class="inner">
-                                    <div class="sw-editable" data-component="cardrow-3">
-                                        <?php get_component("cardrow-3"); ?>
+                                    <div class="sw-editable" data-component="cardrow-$i">
+                                        [[VAR]]
                                     </div>
                                 </div>
                             </section>
                         </div>
-                    <?php } ?>
+END;
+                        output_conditional($content, get_component("cardrow-$i", null, false));
+                    }
+                    ?>
+
                 </div>
             </div>
         </div>