diff --git a/pages/run.php b/pages/run.php
index 005baf2..e49af0d 100644
--- a/pages/run.php
+++ b/pages/run.php
@@ -245,8 +245,6 @@
 
         <div class="row">
             <div class="col-md-6">
-
-                
                 <div class="mb-3">
                     <label>Choose Query</label>
                     <div class="input-group">
@@ -264,62 +262,53 @@
                         <?php endforeach; ?>
                     </div>
                 </div>
-            </div>
-        </div>
 
-        <?php if ($intAllowed == 1): ?>
+                <?php if ($intAllowed == 1): ?>
+                    <?php foreach (["description"] as $strClass): ?>
+                        <?php if (array_key_exists($strClass, $varOptions)): ?>
 
-            <?php foreach (["description"] as $strClass): ?>
-                <?php if (array_key_exists($strClass, $varOptions)): ?>
-                    <div class="row">
-                        <div class="col-md-6">
                             <div class="mb-3">
                                 <?= $varOptions[$strClass]; ?>
                             </div>
-                        </div>
-                    </div>
-                <?php endif; ?>
-            <?php endforeach; ?>
 
-            <?php foreach (["danger", "warning", "info"] as $strClass): ?>
-                <?php if (array_key_exists($strClass, $varOptions)): ?>
-                    <div class="row">
-                        <div class="col-md-6">
+                        <?php endif; ?>
+                    <?php endforeach; ?>
+
+                    <?php foreach (["danger", "warning", "info"] as $strClass): ?>
+                        <?php if (array_key_exists($strClass, $varOptions)): ?>
+
                             <div class="alert alert-<?= $strClass; ?>">
                                 <strong><?= ucfirst($strClass); ?>:</strong> <?= $varOptions[$strClass]; ?>
                             </div>
-                        </div>
-                    </div>
-                <?php endif; ?>
-            <?php endforeach; ?>
 
-            <form method="get">
-                <?php if (count($varInputs[0]) > 0): ?>
-                    <?php for ($i = 0; $i < count($varInputs[0]); $i++): ?>
-                        <?php
-                            $strInputName = $varInputs[1][$i];
-                            $strInputType = $varInputs[2][$i];
+                        <?php endif; ?>
+                    <?php endforeach; ?>
 
-                            $strInputTypeHTML = "text";
+                    <form method="get">
+                        <?php if (count($varInputs[0]) > 0): ?>
+                            <?php for ($i = 0; $i < count($varInputs[0]); $i++): ?>
+                                <?php
+                                    $strInputName = $varInputs[1][$i];
+                                    $strInputType = $varInputs[2][$i];
 
-                            if ($strInputType == "datetime")
-                                $strInputTypeHTML = "date";
+                                    $strInputTypeHTML = "text";
 
-                            $strInputDefaultValue = "";
-                            if (strtolower($varInputs[4][$i]) == "default")
-                                if (strlen($varInputs[5][$i]) > 0)
-                                    $strInputDefaultValue = $varInputs[5][$i];
+                                    if ($strInputType == "datetime")
+                                        $strInputTypeHTML = "date";
 
-                            $varOptions = [];
-                            if (strtolower($varInputs[4][$i]) == "options")
-                            {
-                                $strOptionsList = $varInputs[5][$i];
-                                $varOptions     = explode(",", $strOptionsList);
-                            }
-                        ?>
+                                    $strInputDefaultValue = "";
+                                    if (strtolower($varInputs[4][$i]) == "default")
+                                        if (strlen($varInputs[5][$i]) > 0)
+                                            $strInputDefaultValue = $varInputs[5][$i];
+
+                                    $varOptions = [];
+                                    if (strtolower($varInputs[4][$i]) == "options")
+                                    {
+                                        $strOptionsList = $varInputs[5][$i];
+                                        $varOptions     = explode(",", $strOptionsList);
+                                    }
+                                ?>
 
-                        <div class="row">
-                            <div class="col-md-6">
                                 <div class="mb-3">
                                     <label><?= $strInputName; ?> <code><?= $strInputType; ?></code></label>
 
@@ -350,64 +339,46 @@
                                             </select>
 
                                         </div>
-
                                     <?php else: ?>
-
                                         <div class="input-group">
                                             <span class="input-group-text"><i class="fa fa-fw fa-at"></i></span>
                                             <input type="<?= $strInputTypeHTML; ?>" class="form-control" name="<?= $strInputName; ?>" value="<?= Request::getParam($strInputName) ?? $strInputDefaultValue; ?>" />
                                         </div>
-
                                     <?php endif; ?>
                                 </div>
-                            </div>
-                        </div>
-                    <?php endfor; ?>
-                <?php endif; ?>
+                            <?php endfor; ?>
+                        <?php endif; ?>
 
-
-                <div class="row">
-                    <div class="col-md-6">
                         <div class="mb-3">
                             <label>Actions</label>
                             <div>
                                 <a class="btn btn-primary" onclick="fnSubmit(this);"><i class="fa fa-fw fa-server me-1"></i> Execute</a>
                             </div>
                         </div>
-                    </div>
-                </div>
 
-                <input type="hidden" name="run" value="1" />
-            </form>
+                        <input type="hidden" name="run" value="1" />
+                    </form>
 
-        <?php else: ?>
-
-            <div class="row">
-                <div class="col-md-6">
+                <?php else: ?>
                     <div class="text-danger mb-3">
                         The selected report requires being logged in as a user with permission to run it.
                     </div>
-                </div>
+                <?php endif; ?>
             </div>
 
-        <?php endif; ?>
+            <?php
+                $varDirectories = [];
 
-        <?php
-            $varDirectories = [];
+                foreach ($varFiles as $f)
+                {
+                    preg_match("/^(.*\/)[^\/]/", $f, $varMatches);
+                    $strDirectory = $varMatches[1];
 
-            foreach ($varFiles as $f)
-            {
-                preg_match("/^(.*\/)[^\/]/", $f, $varMatches);
-                $strDirectory = $varMatches[1];
-
-                if (strlen($strDirectory) > 0)
-                    $varDirectories[$strDirectory] = 1;
-            }
-
-            //Respond::json($varDirectoryKeys);
-        ?>
-
-        <div class="row">
+                    if (strlen($strDirectory) > 0)
+                        $varDirectories[$strDirectory] = 1;
+                }
+            ?>
+        
             <div class="col-md-6">
                 <div class="mb-3">
                     <label>Directories</label>
@@ -425,8 +396,8 @@
                     </div>
                 </div>
             </div>
-        </div>
 
+        </div>
 
     </div>
 </div>
@@ -467,7 +438,7 @@
 
         <div class="table-responsive">
             <table class="table table-sm table-striped table-bordered w-100" id="table">
-                <thead>
+                <thead class="sticky-top">
                     <tr>
                         <?php foreach ($varColumns as $col): ?>
                             <?php