diff --git a/Theme/backend/checklist-list.tpl.php b/Theme/backend/checklist-list.tpl.php
index 44e7279..b039f2c 100644
--- a/Theme/backend/checklist-list.tpl.php
+++ b/Theme/backend/checklist-list.tpl.php
@@ -26,30 +26,34 @@ $footerView->setResults(1);
 
 echo $this->getData('nav')->render(); ?>
 
-<div class="box w-100">
-    <table class="table">
-        <caption><?= $this->getText('Checklists'); ?></caption>
-        <thead>
-        <tr>
-            <td><?= $this->getText('ID', 0, 0); ?>
-            <td><?= $this->getText('Status'); ?>
-            <td class="wf-100"><?= $this->getText('Name'); ?>
-            <td><?= $this->getText('Creator'); ?>
-            <td><?= $this->getText('Created'); ?>
-        <tfoot>
-        <tr><td colspan="5"><?= $footerView->render(); ?>
-        <tbody>
-        <?php $c = 0; foreach ([] as $key => $value) : $c++;
-        $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/checklist/single?id=' . $value->getId()); ?>
-        <tr>
-            <td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
-            <td><a href="<?= $url; ?>"><?= $value->getName(); ?></a>
-            <td><a href="<?= $url; ?>"><?= $value->getParent(); ?></a>
-            <td><a href="<?= $url; ?>"><?= $value->getUnit(); ?></a>
-                <?php endforeach; ?>
-                <?php if($c === 0) : ?>
-        <tr>
-            <td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
-                <?php endif; ?>
-    </table>
+<div class="row">
+    <div class="col-xs-12">
+        <div class="box wf-100">
+            <table class="table">
+                <caption><?= $this->getText('Checklists'); ?></caption>
+                <thead>
+                <tr>
+                    <td><?= $this->getText('ID', 0, 0); ?>
+                    <td><?= $this->getText('Status'); ?>
+                    <td class="wf-100"><?= $this->getText('Name'); ?>
+                    <td><?= $this->getText('Creator'); ?>
+                    <td><?= $this->getText('Created'); ?>
+                <tfoot>
+                <tr><td colspan="5"><?= $footerView->render(); ?>
+                <tbody>
+                <?php $c = 0; foreach ([] as $key => $value) : $c++;
+                $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/checklist/single?id=' . $value->getId()); ?>
+                <tr>
+                    <td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $value->getName(); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $value->getParent(); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $value->getUnit(); ?></a>
+                        <?php endforeach; ?>
+                        <?php if($c === 0) : ?>
+                <tr>
+                    <td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
+                        <?php endif; ?>
+            </table>
+        </div>
+    </div>
 </div>
diff --git a/Theme/backend/checklist-template-create.tpl.php b/Theme/backend/checklist-template-create.tpl.php
index 4525521..0a43929 100644
--- a/Theme/backend/checklist-template-create.tpl.php
+++ b/Theme/backend/checklist-template-create.tpl.php
@@ -19,46 +19,52 @@
 
 echo $this->getData('nav')->render(); ?>
 
-<section class="box w-33">
-    <header><h1><?= $this->getText('General'); ?></h1></header>
-    <div class="inner">
-        <form id="fChecklist">
-            <table class="layout wf-100">
-                <tr><td><label for="iName"><?= $this->getText('Name'); ?></label><td>
-                <tr><td><input type="text" id="iName" name="name" required><td>
-                <tr><td><label for="iDescription"><?= $this->getText('Description'); ?></label><td>
-                <tr><td><textarea id="iDescription" name="description"></textarea><td>
-                <tr><td><label for="iPermission"><?= $this->getText('Permissions'); ?></label><td>
-                <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button>
-                            <input type="text" id="iPermission" name="permission"></span>
-                    <td><button><?= $this->getText('Add', 0, 0); ?></button>
-                <tr><td><label for="iFiles"><?= $this->getText('Files'); ?></label><td>
-                <tr><td><input id="iFiles" name="files" type="file" multiple><td>
-                <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>"><td>
-            </table>
-        </form>
+<div class="row">
+    <div class="col-xs-12 col-md-6">
+        <section class="box wf-100">
+            <header><h1><?= $this->getText('General'); ?></h1></header>
+            <div class="inner">
+                <form id="fChecklist">
+                    <table class="layout wf-100">
+                        <tr><td><label for="iName"><?= $this->getText('Name'); ?></label><td>
+                        <tr><td><input type="text" id="iName" name="name" required><td>
+                        <tr><td><label for="iDescription"><?= $this->getText('Description'); ?></label><td>
+                        <tr><td><textarea id="iDescription" name="description"></textarea><td>
+                        <tr><td><label for="iPermission"><?= $this->getText('Permissions'); ?></label><td>
+                        <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button>
+                                    <input type="text" id="iPermission" name="permission"></span>
+                            <td><button><?= $this->getText('Add', 0, 0); ?></button>
+                        <tr><td><label for="iFiles"><?= $this->getText('Files'); ?></label><td>
+                        <tr><td><input id="iFiles" name="files" type="file" multiple><td>
+                        <tr><td><input type="submit" value="<?= $this->getText('Create', 0, 0); ?>"><td>
+                    </table>
+                </form>
+            </div>
+        </section>
     </div>
-</section>
 
-<section class="box w-33">
-    <header><h1><?= $this->getText('Tasks'); ?></h1></header>
-    <div class="inner">
-        <form>
-            <table class="layout wf-100">
-                <tr><td><label for="iETitle"><?= $this->getText('Title'); ?></label><td>
-                <tr><td><input type="text" id="iETitle" name="eTitle" required><td>
-                <tr><td><label for="iEDescription"><?= $this->getText('Description'); ?></label><td>
-                <tr><td><textarea id="iEDescription" name="eDescription"></textarea><td>
-                <tr><td><label for="iETime"><?= $this->getText('TimeInMinutes'); ?></label><td>
-                <tr><td><input type="number" min="0" step="1" id="iETime" name="eTime" value="0"><td>
-                <tr><td><label for="iEPermission"><?= $this->getText('Permissions'); ?></label><td>
-                <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button>
-                            <input type="text" id="iEPermission" name="ePermission"></span>
-                    <td><button data-action=""><?= $this->getText('Add', 0, 0); ?></button>
-                <tr><td><label for="iEFiles"><?= $this->getText('Files'); ?></label><td>
-                <tr><td><input id="iEFiles" name="eFiles" type="file" multiple><td>
-                <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0); ?>" data-action=""><td>
-            </table>
-        </form>
+    <div class="col-xs-12 col-md-6">
+        <section class="box wf-100">
+            <header><h1><?= $this->getText('Tasks'); ?></h1></header>
+            <div class="inner">
+                <form>
+                    <table class="layout wf-100">
+                        <tr><td><label for="iETitle"><?= $this->getText('Title'); ?></label><td>
+                        <tr><td><input type="text" id="iETitle" name="eTitle" required><td>
+                        <tr><td><label for="iEDescription"><?= $this->getText('Description'); ?></label><td>
+                        <tr><td><textarea id="iEDescription" name="eDescription"></textarea><td>
+                        <tr><td><label for="iETime"><?= $this->getText('TimeInMinutes'); ?></label><td>
+                        <tr><td><input type="number" min="0" step="1" id="iETime" name="eTime" value="0"><td>
+                        <tr><td><label for="iEPermission"><?= $this->getText('Permissions'); ?></label><td>
+                        <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button>
+                                    <input type="text" id="iEPermission" name="ePermission"></span>
+                            <td><button data-action=""><?= $this->getText('Add', 0, 0); ?></button>
+                        <tr><td><label for="iEFiles"><?= $this->getText('Files'); ?></label><td>
+                        <tr><td><input id="iEFiles" name="eFiles" type="file" multiple><td>
+                        <tr><td><input type="submit" value="<?= $this->getText('Add', 0, 0); ?>" data-action=""><td>
+                    </table>
+                </form>
+            </div>
+        </section>
     </div>
-</section>
+</div>
\ No newline at end of file
diff --git a/Theme/backend/checklist-template-list.tpl.php b/Theme/backend/checklist-template-list.tpl.php
index f1441fe..aee93b3 100644
--- a/Theme/backend/checklist-template-list.tpl.php
+++ b/Theme/backend/checklist-template-list.tpl.php
@@ -26,30 +26,34 @@ $footerView->setResults(1);
 
 echo $this->getData('nav')->render(); ?>
 
-<div class="box w-100">
-    <table class="table">
-        <caption><?= $this->getText('Templates'); ?></caption>
-        <thead>
-        <tr>
-            <td><?= $this->getText('ID', 0, 0); ?>
-            <td><?= $this->getText('Status'); ?>
-            <td class="wf-100"><?= $this->getText('Name'); ?>
-            <td><?= $this->getText('Creator'); ?>
-            <td><?= $this->getText('Created'); ?>
-        <tfoot>
-        <tr><td colspan="5"><?= $footerView->render(); ?>
-        <tbody>
-        <?php $c = 0; foreach ([] as $key => $value) : $c++;
-        $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/checklist/single?id=' . $value->getId()); ?>
-        <tr>
-            <td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
-            <td><a href="<?= $url; ?>"><?= $value->getName(); ?></a>
-            <td><a href="<?= $url; ?>"><?= $value->getParent(); ?></a>
-            <td><a href="<?= $url; ?>"><?= $value->getUnit(); ?></a>
-                <?php endforeach; ?>
-                <?php if($c === 0) : ?>
-        <tr>
-            <td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
-                <?php endif; ?>
-    </table>
+<div class="row">
+    <div class="col-xs-12">
+        <div class="box wf-100">
+            <table class="table">
+                <caption><?= $this->getText('Templates'); ?></caption>
+                <thead>
+                <tr>
+                    <td><?= $this->getText('ID', 0, 0); ?>
+                    <td><?= $this->getText('Status'); ?>
+                    <td class="wf-100"><?= $this->getText('Name'); ?>
+                    <td><?= $this->getText('Creator'); ?>
+                    <td><?= $this->getText('Created'); ?>
+                <tfoot>
+                <tr><td colspan="5"><?= $footerView->render(); ?>
+                <tbody>
+                <?php $c = 0; foreach ([] as $key => $value) : $c++;
+                $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/checklist/single?id=' . $value->getId()); ?>
+                <tr>
+                    <td><a href="<?= $url; ?>"><?= $value->getId(); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $value->getName(); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $value->getParent(); ?></a>
+                    <td><a href="<?= $url; ?>"><?= $value->getUnit(); ?></a>
+                        <?php endforeach; ?>
+                        <?php if($c === 0) : ?>
+                <tr>
+                    <td colspan="5" class="empty"><?= $this->getText('Empty', 0, 0); ?>
+                        <?php endif; ?>
+            </table>
+        </div>
+    </div>
 </div>