diff --git a/Admin/Settings/Theme/Backend/settings.tpl.php b/Admin/Settings/Theme/Backend/settings.tpl.php
index 07ccc0b..c54ad75 100755
--- a/Admin/Settings/Theme/Backend/settings.tpl.php
+++ b/Admin/Settings/Theme/Backend/settings.tpl.php
@@ -182,7 +182,7 @@ echo $this->data['nav']->render();
     <div class="tab">
         <div class="row">
             <div class="col-xs-12 col-md-4">
-                <div class="portlet">
+                <section class="portlet">
                     <form id="fLocalization"
                         name="fLocalization"
                         action="<?= UriFactory::build('{/api}profile/settings/localization?csrf={$CSRF}'); ?>"
@@ -234,7 +234,7 @@ echo $this->data['nav']->render();
                             <input id="iSubmitLocalization" name="submitLocalization" type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>">
                         </div>
                     </form>
-                </div>
+                </section>
             </div>
 
             <div class="col-xs-12 col-md-4">
@@ -694,10 +694,10 @@ echo $this->data['nav']->render();
     </div>
     <input type="radio" id="c-tab-5"
         name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>
-    <div class="tab">
-        <div class="col-xs-12">
-            <div class="portlet">
-                <div class="portlet-head"><?= $this->getHtml('Settings'); ?><i class="g-icon download btn end-xs">download</i></div>
+        <div class="tab">
+            <div class="col-xs-12">
+                <section class="portlet">
+                    <div class="portlet-head"><?= $this->getHtml('Settings'); ?><i class="g-icon download btn end-xs">download</i></div>
                     <div class="slider">
                     <table id="settingsList" class="default sticky">
                         <thead>
@@ -827,7 +827,7 @@ echo $this->data['nav']->render();
                         <a tabindex="0" class="button" href="<?= UriFactory::build($previousSettings); ?>"><?= $this->getHtml('Previous', '0', '0'); ?></a>
                         <a tabindex="0" class="button" href="<?= UriFactory::build($nextSettings); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
                     </div>
-                </div>
+                </section>
             </div>
         </div>
     </div>
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index c038f27..ead1724 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -2840,6 +2840,8 @@ final class ApiController extends Controller
         $account = (int) $request->getData('account');
         $groups  = [$request->getDataInt('account-list') ?? 0];
 
+        // @todo Check if already in group
+
         $this->createModelRelation($request->header->account, $account, $groups, AccountMapper::class, 'groups', 'account-group', $request->getOrigin());
         $this->createStandardAddResponse($request, $response, $groups);
     }
diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index b02af0b..0108eae 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -27,6 +27,7 @@ use Modules\Organization\Models\UnitMapper;
 use phpOMS\Autoloader;
 use phpOMS\Contract\RenderableInterface;
 use phpOMS\DataStorage\Database\Query\OrderType;
+use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\Utils\Parser\Markdown\Markdown;
@@ -518,14 +519,14 @@ final class BackendController extends Controller
      */
     public function viewModuleInfo(RequestAbstract $request, ResponseAbstract $response, array $data = []) : RenderableInterface
     {
-        /*
-        $head  = $response->data['Content']->head;
-        $nonce = $this->app->appSettings->getOption('script-nonce');
-
-        $head->addAsset(AssetType::JSLATE, 'Resources/mermaid/mermaid.min.js?v=' . $this->app->version, ['nonce' => $nonce]);
-        */
-
         $view = new View($this->app->l11nManager, $request, $response);
+        if (!$request->hasData('id')) {
+            $response->header->status = RequestStatusCode::R_404;
+            $view->setTemplate('/Web/Backend/Error/404');
+
+            return $view;
+        }
+
         $view->setTemplate('/Modules/Admin/Theme/Backend/modules-info');
         $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000105001, $request, $response);
 
diff --git a/Theme/Backend/Components/Localization/l11n-view.tpl.php b/Theme/Backend/Components/Localization/l11n-view.tpl.php
index 72ded4a..fd4c67c 100644
--- a/Theme/Backend/Components/Localization/l11n-view.tpl.php
+++ b/Theme/Backend/Components/Localization/l11n-view.tpl.php
@@ -32,7 +32,7 @@ $temperatures = TemperatureType::getConstants();
 ?>
 <div class="row">
     <div class="col-xs-12 col-md-4">
-        <div class="portlet">
+        <section class="portlet">
             <form id="fLocalization" name="fLocalization" action="<?= UriFactory::build('{/api}profile/settings/localization?csrf={$CSRF}'); ?>" method="post">
             <div class="portlet-head"><?= $this->getHtml('Localization'); ?></div>
             <div class="portlet-body">
@@ -82,11 +82,11 @@ $temperatures = TemperatureType::getConstants();
                 <input id="iSubmitLocalization" name="submitLocalization" type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>">
             </div>
             </form>
-        </div>
+        </section>
     </div>
 
     <div class="col-xs-12 col-md-4">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Time'); ?></div>
             <div class="portlet-body">
                 <div class="form-group">
@@ -127,11 +127,11 @@ $temperatures = TemperatureType::getConstants();
                     <input form="fLocalization" id="iTimeformatVeryLong" name="settings_timeformat_vl" type="text" value="<?= $this->printHtml($l11n->getDatetime()['very_long']); ?>" placeholder="Y.m.d h:i:s" required>
                 </div>
             </div>
-        </div>
+        </section>
     </div>
 
     <div class="col-xs-12 col-md-4">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Numeric'); ?></div>
             <div class="portlet-body">
                 <div class="form-group">
@@ -171,11 +171,11 @@ $temperatures = TemperatureType::getConstants();
                     </div>
                 </div>
             </div>
-        </div>
+        </section>
     </div>
 
     <div class="col-xs-12 col-md-4">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Precision'); ?></div>
             <div class="portlet-body">
                 <div class="form-group">
@@ -203,11 +203,11 @@ $temperatures = TemperatureType::getConstants();
                     <input form="fLocalization" id="iPrecisionVeryLong" name="settings_precision_vl" value="<?= $l11n->getPrecision()['very_long']; ?>" type="number">
                 </div>
             </div>
-        </div>
+        </section>
     </div>
 
     <div class="col-xs-12 col-md-4">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Weight'); ?></div>
             <div class="portlet-body">
                 <div class="form-group">
@@ -255,11 +255,11 @@ $temperatures = TemperatureType::getConstants();
                     </select>
                 </div>
             </div>
-        </div>
+        </section>
     </div>
 
     <div class="col-xs-12 col-md-4">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Speed'); ?></div>
             <div class="portlet-body">
                 <div class="form-group">
@@ -316,11 +316,11 @@ $temperatures = TemperatureType::getConstants();
                     </select>
                 </div>
             </div>
-        </div>
+        </section>
     </div>
 
     <div class="col-xs-12 col-md-4">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Length'); ?></div>
             <div class="portlet-body">
                 <div class="form-group">
@@ -377,11 +377,11 @@ $temperatures = TemperatureType::getConstants();
                     </select>
                 </div>
             </div>
-        </div>
+        </section>
     </div>
 
     <div class="col-xs-12 col-md-4">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Area'); ?></div>
             <div class="portlet-body">
                 <div class="form-group">
@@ -429,11 +429,11 @@ $temperatures = TemperatureType::getConstants();
                     </select>
                 </div>
             </div>
-        </div>
+        </section>
     </div>
 
     <div class="col-xs-12 col-md-4">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Volume'); ?></div>
             <div class="portlet-body">
                 <div class="form-group">
@@ -508,6 +508,6 @@ $temperatures = TemperatureType::getConstants();
                     </select>
                 </div>
             </div>
-        </div>
+        </section>
     </div>
 </div>
\ No newline at end of file
diff --git a/Theme/Backend/accounts-create.tpl.php b/Theme/Backend/accounts-create.tpl.php
index 173c1b0..fe2fa8a 100755
--- a/Theme/Backend/accounts-create.tpl.php
+++ b/Theme/Backend/accounts-create.tpl.php
@@ -21,7 +21,7 @@ echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12 col-md-6">
-        <div class="portlet">
+        <section class="portlet">
             <form id="fAccount" action="<?= UriFactory::build('{/api}admin/account?csrf={$CSRF}'); ?>" method="put">
                 <div class="portlet-head"><?= $this->getHtml('Account'); ?></div>
                 <div class="portlet-body">
@@ -95,6 +95,6 @@ echo $this->data['nav']->render(); ?>
                     <input id="account-create-submit" name="createSubmit" type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
                 </div>
             </form>
-        </div>
+        </section>
     </div>
 </div>
diff --git a/Theme/Backend/accounts-list.tpl.php b/Theme/Backend/accounts-list.tpl.php
index dd63669..12e88b6 100755
--- a/Theme/Backend/accounts-list.tpl.php
+++ b/Theme/Backend/accounts-list.tpl.php
@@ -42,7 +42,7 @@ echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head">
                 <?= $tableView->renderTitle(
                     $this->getHtml('Accounts')
@@ -118,6 +118,6 @@ echo $this->data['nav']->render(); ?>
             </div>
             <?php endif; ?>
             -->
-        </div>
+        </section>
     </div>
 </div>
diff --git a/Theme/Backend/accounts-view.tpl.php b/Theme/Backend/accounts-view.tpl.php
index b069a3a..caf6358 100644
--- a/Theme/Backend/accounts-view.tpl.php
+++ b/Theme/Backend/accounts-view.tpl.php
@@ -61,7 +61,7 @@ echo $this->data['nav']->render(); ?>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
-                    <div class="portlet">
+                    <section class="portlet">
                         <form id="account-edit" action="<?= UriFactory::build('{/api}admin/account?csrf={$CSRF}'); ?>" method="post">
                             <div class="portlet-head"><?= $this->getHtml('Account'); ?></div>
                             <div class="portlet-body">
@@ -147,7 +147,7 @@ echo $this->data['nav']->render(); ?>
                                 ]'><?= $this->getHtml('CreateProfile'); ?></button>
                             </div>
                         </form>
-                    </div>
+                    </section>
                 </div>
             </div>
         </div>
@@ -156,7 +156,7 @@ echo $this->data['nav']->render(); ?>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
-                    <div class="portlet">
+                    <section class="portlet">
                         <form id="iAddGroupToAccount" action="<?= UriFactory::build('{/api}admin/account/group?csrf={$CSRF}'); ?>" method="put">
                             <div class="portlet-head"><?= $this->getHtml('Groups'); ?></div>
                             <div class="portlet-body">
@@ -170,11 +170,11 @@ echo $this->data['nav']->render(); ?>
                                 <input type="submit" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                             </div>
                         </form>
-                    </div>
+                    </section>
                 </div>
 
                 <div class="col-xs-12">
-                    <div class="portlet">
+                    <section class="portlet">
                         <div class="portlet-head"><?= $this->getHtml('Groups'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <table id="groupTable" class="default sticky">
                             <thead>
@@ -198,7 +198,7 @@ echo $this->data['nav']->render(); ?>
                                     <tr><td colspan="3" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                                 <?php endif; ?>
                         </table>
-                    </div>
+                    </section>
                 </div>
             </div>
         </div>
@@ -207,7 +207,7 @@ echo $this->data['nav']->render(); ?>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
-                <div class="portlet">
+                    <section class="portlet">
                         <form id="permissionForm"
                             action="<?= UriFactory::build('{/api}admin/account/permission?csrf={$CSRF}'); ?>"
                             data-ui-container="#permissionTable tbody"
@@ -320,11 +320,11 @@ echo $this->data['nav']->render(); ?>
                                 <input type="submit" class="cancel-form vh button close" value="<?= $this->getHtml('Cancel', '0', '0'); ?>">
                             </div>
                         </form>
-                    </div>
+                    </section>
                 </div>
 
                 <div class="col-xs-12 col-md-6">
-                    <div class="portlet">
+                    <section class="portlet">
                         <div class="portlet-head"><?= $this->getHtml('Permissions'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <div class="slider">
                             <table id="permissionTable" class="default sticky"
@@ -409,7 +409,7 @@ echo $this->data['nav']->render(); ?>
                                     <?php endif; ?>
                             </table>
                         </div>
-                    </div>
+                    </section>
                 </div>
             </div>
         </div>
@@ -421,71 +421,70 @@ echo $this->data['nav']->render(); ?>
 
         <input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>
         <div class="tab">
-        <div class="row">
-            <div class="col-xs-12">
-                <div class="portlet">
-                    <div class="portlet-head"><?= $tableView->renderTitle($this->getHtml('Audits', 'Auditor', 'Backend')); ?></div>
-                    <div class="slider">
-                    <table id="<?= $tableView->id; ?>" class="default sticky">
-                        <thead>
-                        <tr>
-                            <td><?= $tableView->renderHeaderElement('id',  $this->getHtml('ID', '0', '0'), 'number'); ?>
-                            <td><?= $tableView->renderHeaderElement('module', $this->getHtml('Module', 'Auditor', 'Backend'), 'text'); ?>
-                            <td><?= $tableView->renderHeaderElement('action', $this->getHtml('Action', 'Auditor', 'Backend'), 'select',
-                                [
-                                    'create' => $this->getHtml('CREATE', 'Auditor', 'Backend'),
-                                    'modify' => $this->getHtml('UPDATE', 'Auditor', 'Backend'),
-                                    'delete' => $this->getHtml('DELETE', 'Auditor', 'Backend'),
-                                ],
-                                false // don't render sort
-                            ); ?>
-                            <td><?= $tableView->renderHeaderElement('type', $this->getHtml('Type', 'Auditor', 'Backend'), 'number'); ?>
-                            <td class="wf-100"><?= $tableView->renderHeaderElement('trigger', $this->getHtml('Trigger', 'Auditor', 'Backend'), 'text'); ?>
-                            <td><?= $tableView->renderHeaderElement('createdBy', $this->getHtml('By', 'Auditor', 'Backend'), 'text'); ?>
-                            <td><?= $tableView->renderHeaderElement('ref', $this->getHtml('Ref', 'Auditor', 'Backend'), 'text', [], true, true, false); ?>
-                            <td><?= $tableView->renderHeaderElement('createdAt', $this->getHtml('Date', 'Auditor', 'Backend'), 'date'); ?>
-                        <tbody>
-                        <?php
-                        $count = 0;
-                        foreach ($audits as $key => $audit) : ++$count;
-                            $url = UriFactory::build('{/base}/admin/audit/view?id=' . $audit->id); ?>
-                            <tr tabindex="0" data-href="<?= $url; ?>">
-                                <td><?= $audit->id; ?>
-                                <td><?= $this->printHtml($audit->module); ?>
-                                <td><?php if ($audit->old === null) : echo $this->getHtml('CREATE', 'Auditor', 'Backend'); ?>
-                                    <?php elseif ($audit->old !== null && $audit->new !== null) : echo $this->getHtml('UPDATE', 'Auditor', 'Backend'); ?>
-                                    <?php elseif ($audit->new === null) : echo $this->getHtml('DELETE', 'Auditor', 'Backend'); ?>
-                                    <?php else : echo $this->getHtml('UNKNOWN', 'Auditor', 'Backend'); ?>
-                                    <?php endif; ?>
-                                <td><?= $this->printHtml((string) $audit->type); ?>
-                                <td><?= $this->printHtml($audit->trigger); ?>
-                                <td><a class="content" href="<?= UriFactory::build('{/base}/admin/account/settings?id=' . $audit->createdBy->id); ?>"><?= $this->printHtml(
-                                        $this->renderUserName('%3$s %2$s %1$s', [$audit->createdBy->name1, $audit->createdBy->name2, $audit->createdBy->name3, $audit->createdBy->login])
-                                    ); ?></a>
-                                <td><?= $this->printHtml((string) $audit->ref); ?>
-                                <td><?= $audit->createdAt->format('Y-m-d H:i:s'); ?>
-                        <?php endforeach; ?>
-                        <?php if ($count === 0) : ?>
-                            <tr><td colspan="8" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
-                        <?php endif; ?>
-                    </table>
-                    </div>
-                    <!--
-                    <?php if ($this->getData('hasPrevious') || $this->getData('hasNext')) : ?>
-                        <div class="portlet-foot">
-                            <?php if ($this->getData('hasPrevious')) : ?>
-                                <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><i class="g-icon">chevron_left</i></a>
-                            <?php endif; ?>
-                            <?php if ($this->getData('hasNext')) : ?>
-                                <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><i class="g-icon">chevron_right</i></a>
+            <div class="row">
+                <div class="col-xs-12">
+                    <section class="portlet">
+                        <div class="portlet-head"><?= $tableView->renderTitle($this->getHtml('Audits', 'Auditor', 'Backend')); ?></div>
+                        <div class="slider">
+                        <table id="<?= $tableView->id; ?>" class="default sticky">
+                            <thead>
+                            <tr>
+                                <td><?= $tableView->renderHeaderElement('id',  $this->getHtml('ID', '0', '0'), 'number'); ?>
+                                <td><?= $tableView->renderHeaderElement('module', $this->getHtml('Module', 'Auditor', 'Backend'), 'text'); ?>
+                                <td><?= $tableView->renderHeaderElement('action', $this->getHtml('Action', 'Auditor', 'Backend'), 'select',
+                                    [
+                                        'create' => $this->getHtml('CREATE', 'Auditor', 'Backend'),
+                                        'modify' => $this->getHtml('UPDATE', 'Auditor', 'Backend'),
+                                        'delete' => $this->getHtml('DELETE', 'Auditor', 'Backend'),
+                                    ],
+                                    false // don't render sort
+                                ); ?>
+                                <td><?= $tableView->renderHeaderElement('type', $this->getHtml('Type', 'Auditor', 'Backend'), 'number'); ?>
+                                <td class="wf-100"><?= $tableView->renderHeaderElement('trigger', $this->getHtml('Trigger', 'Auditor', 'Backend'), 'text'); ?>
+                                <td><?= $tableView->renderHeaderElement('createdBy', $this->getHtml('By', 'Auditor', 'Backend'), 'text'); ?>
+                                <td><?= $tableView->renderHeaderElement('ref', $this->getHtml('Ref', 'Auditor', 'Backend'), 'text', [], true, true, false); ?>
+                                <td><?= $tableView->renderHeaderElement('createdAt', $this->getHtml('Date', 'Auditor', 'Backend'), 'date'); ?>
+                            <tbody>
+                            <?php
+                            $count = 0;
+                            foreach ($audits as $key => $audit) : ++$count;
+                                $url = UriFactory::build('{/base}/admin/audit/view?id=' . $audit->id); ?>
+                                <tr tabindex="0" data-href="<?= $url; ?>">
+                                    <td><?= $audit->id; ?>
+                                    <td><?= $this->printHtml($audit->module); ?>
+                                    <td><?php if ($audit->old === null) : echo $this->getHtml('CREATE', 'Auditor', 'Backend'); ?>
+                                        <?php elseif ($audit->old !== null && $audit->new !== null) : echo $this->getHtml('UPDATE', 'Auditor', 'Backend'); ?>
+                                        <?php elseif ($audit->new === null) : echo $this->getHtml('DELETE', 'Auditor', 'Backend'); ?>
+                                        <?php else : echo $this->getHtml('UNKNOWN', 'Auditor', 'Backend'); ?>
+                                        <?php endif; ?>
+                                    <td><?= $this->printHtml((string) $audit->type); ?>
+                                    <td><?= $this->printHtml($audit->trigger); ?>
+                                    <td><a class="content" href="<?= UriFactory::build('{/base}/admin/account/settings?id=' . $audit->createdBy->id); ?>"><?= $this->printHtml(
+                                            $this->renderUserName('%3$s %2$s %1$s', [$audit->createdBy->name1, $audit->createdBy->name2, $audit->createdBy->name3, $audit->createdBy->login])
+                                        ); ?></a>
+                                    <td><?= $this->printHtml((string) $audit->ref); ?>
+                                    <td><?= $audit->createdAt->format('Y-m-d H:i:s'); ?>
+                            <?php endforeach; ?>
+                            <?php if ($count === 0) : ?>
+                                <tr><td colspan="8" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                             <?php endif; ?>
+                        </table>
                         </div>
-                    <?php endif; ?>
-                    -->
+                        <!--
+                        <?php if ($this->getData('hasPrevious') || $this->getData('hasNext')) : ?>
+                            <div class="portlet-foot">
+                                <?php if ($this->getData('hasPrevious')) : ?>
+                                    <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><i class="g-icon">chevron_left</i></a>
+                                <?php endif; ?>
+                                <?php if ($this->getData('hasNext')) : ?>
+                                    <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><i class="g-icon">chevron_right</i></a>
+                                <?php endif; ?>
+                            </div>
+                        <?php endif; ?>
+                        -->
+                    </section>
                 </div>
             </div>
         </div>
-
-        </div>
     </div>
 </div>
diff --git a/Theme/Backend/groups-create.tpl.php b/Theme/Backend/groups-create.tpl.php
index 1a29a63..d05be63 100755
--- a/Theme/Backend/groups-create.tpl.php
+++ b/Theme/Backend/groups-create.tpl.php
@@ -20,7 +20,7 @@ echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12 col-md-6">
-        <div class="portlet">
+        <section class="portlet">
             <form id="fGroupCreate"
                 action="<?= UriFactory::build('{/api}admin/group?csrf={$CSRF}'); ?>"
                 method="put"
@@ -50,6 +50,6 @@ echo $this->data['nav']->render(); ?>
                     <input type="submit" id="iCreate" name="create" value="<?= $this->getHtml('Create', '0', '0'); ?>">
                 </div>
             </form>
-        </div>
+        </section>
     </div>
 </div>
diff --git a/Theme/Backend/groups-list.tpl.php b/Theme/Backend/groups-list.tpl.php
index 1803b3a..0035010 100755
--- a/Theme/Backend/groups-list.tpl.php
+++ b/Theme/Backend/groups-list.tpl.php
@@ -43,7 +43,7 @@ echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head">
                 <?= $tableView->renderTitle(
                     $this->getHtml('Groups')
@@ -115,6 +115,6 @@ echo $this->data['nav']->render(); ?>
             </div>
             <?php endif; ?>
             -->
-        </div>
+        </section>
     </div>
 </div>
\ No newline at end of file
diff --git a/Theme/Backend/groups-view.tpl.php b/Theme/Backend/groups-view.tpl.php
index 6745960..cd9afbc 100644
--- a/Theme/Backend/groups-view.tpl.php
+++ b/Theme/Backend/groups-view.tpl.php
@@ -49,7 +49,7 @@ echo $this->data['nav']->render(); ?>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
-                    <div class="portlet">
+                    <section class="portlet">
                         <form id="fGroupEdit" action="<?= UriFactory::build('{/api}admin/group?csrf={$CSRF}'); ?>" method="post">
                             <div class="portlet-head"><?= $this->getHtml('Group'); ?></div>
                             <div class="portlet-body">
@@ -86,7 +86,7 @@ echo $this->data['nav']->render(); ?>
                                 <input id="groupSubmit" name="groupsubmit" type="submit" value="<?= $this->getHtml('Save', '0', '0'); ?>">
                             </div>
                         </form>
-                    </div>
+                    </section>
                 </div>
             </div>
         </div>
@@ -95,7 +95,7 @@ echo $this->data['nav']->render(); ?>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
-                    <div class="portlet">
+                    <section class="portlet">
                         <form id="iAddAccountToGroup" action="<?= UriFactory::build('{/api}admin/group/account?csrf={$CSRF}'); ?>" method="put"
                             data-ui-container="#accountTable tbody"
                             data-add-form="accountForm"
@@ -113,13 +113,13 @@ echo $this->data['nav']->render(); ?>
                                 <input id="bAccountAdd" formmethod="put" type="submit" class="add-form" value="<?= $this->getHtml('Add', '0', '0'); ?>">
                             </div>
                         </form>
-                    </div>
+                    </section>
                 </div>
             </div>
 
             <div class="row">
                 <div class="col-xs-12">
-                    <div class="portlet">
+                    <section class="portlet">
                         <div class="portlet-head"><?= $this->getHtml('Accounts'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <table id="accountTable" class="default sticky"
                             data-tag="form"
@@ -164,7 +164,7 @@ echo $this->data['nav']->render(); ?>
                                     <tr><td colspan="3" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                                 <?php endif; ?>
                         </table>
-                    </div>
+                    </section>
                 </div>
             </div>
         </div>
@@ -173,7 +173,7 @@ echo $this->data['nav']->render(); ?>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
-                <div class="portlet">
+                    <section class="portlet">
                         <form id="permissionForm"
                             action="<?= UriFactory::build('{/api}admin/group/permission?csrf={$CSRF}'); ?>"
                             data-ui-container="#permissionTable tbody"
@@ -279,11 +279,11 @@ echo $this->data['nav']->render(); ?>
                                 <input type="submit" class="cancel-form vh button close" value="<?= $this->getHtml('Cancel', '0', '0'); ?>">
                             </div>
                         </form>
-                    </div>
+                    </section>
                 </div>
 
                 <div class="col-xs-12 col-md-6">
-                    <div class="portlet">
+                    <section class="portlet">
                         <div class="portlet-head"><?= $this->getHtml('Permissions'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <div class="slider">
                             <table id="permissionTable" class="default sticky"
@@ -368,7 +368,7 @@ echo $this->data['nav']->render(); ?>
                                     <?php endif; ?>
                             </table>
                         </div>
-                    </div>
+                    </section>
                 </div>
             </div>
         </div>
@@ -377,7 +377,7 @@ echo $this->data['nav']->render(); ?>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
-                    <div class="portlet">
+                    <section class="portlet">
                         <div class="portlet-head"><?= $this->getHtml('Audits', 'Auditor'); ?><i class="g-icon download btn end-xs">download</i></div>
                         <table class="default fixed">
                             <thead>
@@ -411,7 +411,7 @@ echo $this->data['nav']->render(); ?>
                             <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
                         </div>
                         -->
-                    </div>
+                    </section>
                 </div>
             </div>
         </div>
diff --git a/Theme/Backend/modules-hook-list.tpl.php b/Theme/Backend/modules-hook-list.tpl.php
index 70cc98f..53dd52c 100755
--- a/Theme/Backend/modules-hook-list.tpl.php
+++ b/Theme/Backend/modules-hook-list.tpl.php
@@ -23,7 +23,7 @@ echo $this->data['nav']->render();
 
 <div class="row">
     <div class="col-xs-12">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Hooks'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="navElements" class="default sticky">
@@ -92,6 +92,6 @@ echo $this->data['nav']->render();
                         <tr><td colspan="4" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
                     <?php endif; ?>
             </table>
-        </div>
+        </section>
     </div>
 </div>
diff --git a/Theme/Backend/modules-info.tpl.php b/Theme/Backend/modules-info.tpl.php
index f878a05..d62be41 100755
--- a/Theme/Backend/modules-info.tpl.php
+++ b/Theme/Backend/modules-info.tpl.php
@@ -35,7 +35,7 @@ if (isset($installed[$id])) {
 
 <div class="row">
     <div class="col-xs-12 col-md-6 col-lg-4">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->printHtml($module->getExternalName()); ?></div>
 
             <div class="portlet-body">
@@ -88,16 +88,16 @@ if (isset($installed[$id])) {
                     </div>
                 <?php endif; ?>
             </div>
-        </div>
+        </section>
     </div>
 
     <?php if (!empty($this->getData('introduction'))) : ?>
     <div class="col-xs-12 col-md-8">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-body">
                 <article><?= $this->data['introduction']; ?></article>
             </div>
-        </div>
+        </section>
     </div>
     <?php endif; ?>
 </div>
diff --git a/Theme/Backend/modules-list.tpl.php b/Theme/Backend/modules-list.tpl.php
index 6bd243a..6d805bd 100755
--- a/Theme/Backend/modules-list.tpl.php
+++ b/Theme/Backend/modules-list.tpl.php
@@ -31,7 +31,7 @@ $tableView->setObjects($modules);
 ?>
 <div class="row">
     <div class="col-xs-12">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head">
                 <?= $tableView->renderTitle(
                     $this->getHtml('Modules')
@@ -105,6 +105,6 @@ $tableView->setObjects($modules);
                 <?php endif; ?>
             </table>
             </div>
-        </div>
+        </section>
     </div>
 </div>
diff --git a/Theme/Backend/modules-log.tpl.php b/Theme/Backend/modules-log.tpl.php
index b3db41e..89b7eeb 100755
--- a/Theme/Backend/modules-log.tpl.php
+++ b/Theme/Backend/modules-log.tpl.php
@@ -28,7 +28,7 @@ echo $this->data['nav']->render();
 
 <div class="row">
     <div class="col-xs-12">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Audits', 'Auditor'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table class="default sticky">
@@ -75,6 +75,6 @@ echo $this->data['nav']->render();
                 <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
             </div>
             -->
-        </div>
+        </section>
     </div>
 </div>
diff --git a/Theme/Backend/modules-route-list.tpl.php b/Theme/Backend/modules-route-list.tpl.php
index 229e926..77e03e9 100755
--- a/Theme/Backend/modules-route-list.tpl.php
+++ b/Theme/Backend/modules-route-list.tpl.php
@@ -25,7 +25,7 @@ echo $this->data['nav']->render();
 
 <div class="row">
     <div class="col-xs-12">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Routes'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="navElements" class="default sticky">
@@ -102,7 +102,11 @@ echo $this->data['nav']->render();
                         <td><?= $uri; ?>
                         <td><?= $route['dest']; ?>
                     <?php endforeach; endforeach; endforeach; ?>
+                    <?php if ($c === 0) : ?>
+                    <tr>
+                        <td colspan="5" class="empty"><?= $this->getHtml('Empty', '0', '0'); ?>
+                    <?php endif; ?>
             </table>
-        </div>
+        </section>
     </div>
 </div>
diff --git a/Theme/Backend/modules-settings.tpl.php b/Theme/Backend/modules-settings.tpl.php
index 4dafdd7..618117a 100755
--- a/Theme/Backend/modules-settings.tpl.php
+++ b/Theme/Backend/modules-settings.tpl.php
@@ -26,7 +26,7 @@ if ($this->hasData('settingsTpl')
 else : ?>
 <div class="row">
     <div class="col-xs-12">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->getHtml('Settings'); ?><i class="g-icon download btn end-xs">download</i></div>
             <div class="slider">
             <table id="settingsList" class="default sticky">
@@ -137,7 +137,7 @@ else : ?>
                 <?php endif; ?>
             </table>
             </div>
-        </div>
+        </section>
     </div>
 </div>
 <?php endif; ?>
diff --git a/Theme/Backend/page-list.tpl.php b/Theme/Backend/page-list.tpl.php
index 95ab4fd..99ca1f3 100755
--- a/Theme/Backend/page-list.tpl.php
+++ b/Theme/Backend/page-list.tpl.php
@@ -28,7 +28,7 @@ echo $this->data['nav']->render(); ?>
 
 <div class="row">
     <div class="col-xs-12">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head">
                 <?= $this->getHtml('Pages'); ?>
             </div>
@@ -114,6 +114,6 @@ echo $this->data['nav']->render(); ?>
                 <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
             </div>
             -->
-        </div>
+        </section>
     </div>
 </div>