diff --git a/.github/dev_bug_report.md b/.github/dev_bug_report.md
deleted file mode 100644
index ef93e56..0000000
--- a/.github/dev_bug_report.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-name: Dev Bug Report
-about: Create a report to help us improve
-title: ''
-labels: stat_backlog, type_bug
-assignees: ''
-
----
-
-# Bug Description
-A clear and concise description of what the bug is.
-
-# How to Reproduce
-
-Steps to reproduce the behavior:
-
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-## Minimal Code Example
-
-```
-// your code ...
-```
-
-# Expected Behavior
-A clear and concise description of what you expected to happen.
-
-# Screenshots
-If applicable, add screenshots to help explain your problem.
-
-# Additional Information
-Add any other context about the problem here.
diff --git a/.github/dev_feature_request.md b/.github/dev_feature_request.md
deleted file mode 100644
index 9573c35..0000000
--- a/.github/dev_feature_request.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-name: Dev Feature Request
-about: Suggest an idea for this project
-title: ''
-labels: stat_backlog, type_feature
-assignees: ''
-
----
-
-# What is the feature you request
-* A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-* A clear and concise description of what you want to happen.
-
-# Alternatives
-A clear and concise description of any alternative solutions or features you've considered.
-
-# Additional Information
-Add any other context or screenshots about the feature request here.
diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index 06aef84..2731613 100644
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "BusinessExpenses",
-        "uri": "{/base}/businessexpenses/expense/list",
+        "uri": "{/base}/businessexpenses/expense/list?{?}",
         "target": "self",
         "icon": null,
         "order": 40,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/base}/businessexpenses/expense/list",
+                "uri": "{/base}/businessexpenses/expense/list?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 40,
@@ -35,7 +35,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/base}/businessexpenses/expense/create",
+                "uri": "{/base}/businessexpenses/expense/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 40,
@@ -53,7 +53,7 @@
         "type": 2,
         "subtype": 1,
         "name": "BusinessExpenses",
-        "uri": "{/base}/businessexpenses/expense/list",
+        "uri": "{/base}/businessexpenses/expense/list?{?}",
         "target": "self",
         "icon": null,
         "order": 40,
@@ -67,7 +67,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/base}/businessexpenses/expense/list",
+                "uri": "{/base}/businessexpenses/expense/list?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 40,
@@ -83,7 +83,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/base}/businessexpenses/expense/create",
+                "uri": "{/base}/businessexpenses/expense/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 40,
diff --git a/Admin/Installer.php b/Admin/Installer.php
index 19a64ba..5d23905 100644
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -83,7 +83,7 @@ final class Installer extends InstallerAbstract
         $expenseTypes = [];
 
         /** @var \Modules\BusinessExpenses\Controller\ApiController $module */
-        $module = $app->moduleManager->getModuleInstance('BusinessExpenses');
+        $module = $app->moduleManager->get('BusinessExpenses');
 
         /** @var array $type */
         foreach ($types as $type) {
@@ -144,7 +144,7 @@ final class Installer extends InstallerAbstract
         $elementTypes = [];
 
         /** @var \Modules\BusinessExpenses\Controller\ApiController $module */
-        $module = $app->moduleManager->getModuleInstance('BusinessExpenses');
+        $module = $app->moduleManager->get('BusinessExpenses');
 
         /** @var array $type */
         foreach ($types as $type) {
diff --git a/Theme/Backend/expense-list.tpl.php b/Theme/Backend/expense-list.tpl.php
index 4e18c34..a198a09 100644
--- a/Theme/Backend/expense-list.tpl.php
+++ b/Theme/Backend/expense-list.tpl.php
@@ -119,8 +119,8 @@ echo $this->data['nav']->render(); ?>
                     <td>
                     <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $value->id; ?></a>
                     <td data-label="<?= $this->getHtml('Status'); ?>"><a href="<?= $url; ?>"><?= $this->getHtml(':status' . $value->status); ?></a>
-                    <td class="centerText" data-label="<?= $this->getHtml('Paid'); ?>"><a href="<?= $url; ?>"><i class="g-icon"><?= $value->paid ? 'check' : 'close'; ?></i></a>
-                    <td class="centerText" data-label="<?= $this->getHtml('Approved'); ?>"><a href="<?= $url; ?>"><i class="g-icon"><?= $value->approved ? 'check' : 'close'; ?></i></a>
+                    <td class="cT" data-label="<?= $this->getHtml('Paid'); ?>"><a href="<?= $url; ?>"><i class="g-icon"><?= $value->paid ? 'check' : 'close'; ?></i></a>
+                    <td class="cT" data-label="<?= $this->getHtml('Approved'); ?>"><a href="<?= $url; ?>"><i class="g-icon"><?= $value->approved ? 'check' : 'close'; ?></i></a>
                     <td data-label="<?= $this->getHtml('From'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->from->name1, $value->from->name2, $value->from->name3])); ?></a>
                     <td data-label="<?= $this->getHtml('Amount'); ?>"><a href="<?= $url; ?>"><?= $this->getCurrency($value->gross, symbol: ''); ?></a>
                     <td data-label="<?= $this->getHtml('Start'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->start->format('Y-m-d')); ?></a>
diff --git a/Theme/Backend/expense-view.tpl.php b/Theme/Backend/expense-view.tpl.php
index 7f77b62..7e9965f 100644
--- a/Theme/Backend/expense-view.tpl.php
+++ b/Theme/Backend/expense-view.tpl.php
@@ -34,7 +34,7 @@ echo $this->data['nav']->render(); ?>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-lg-6">
-                    <section class="portlet highlight-2">
+                    <section class="portlet hl-2">
                         <div class="portlet-body">
                             <table class="wf-100">
                                 <tr><td><?= $this->getHtml('Net'); ?>:
@@ -47,7 +47,7 @@ echo $this->data['nav']->render(); ?>
                 </div>
 
                 <div class="col-xs-12 col-lg-6">
-                    <section class="portlet highlight-3">
+                    <section class="portlet hl-3">
                         <div class="portlet-body">
                             <table class="wf-100">
                                 <tr><td><?= $this->getHtml('Approved'); ?>: