diff --git a/Models/PermissionState.php b/Models/PermissionState.php
index 5acbe09..0e77075 100755
--- a/Models/PermissionState.php
+++ b/Models/PermissionState.php
@@ -27,13 +27,22 @@ use phpOMS\Stdlib\Base\Enum;
 abstract class PermissionState extends Enum
 {
     public const COCKPIT    = 1;
+
     public const RISK       = 2;
+
     public const CAUSE      = 3;
+
     public const SOLUTION   = 4;
+
     public const UNIT       = 5;
+
     public const DEPARTMENT = 6;
+
     public const CATEGORY   = 7;
+
     public const PROJECT    = 8;
+
     public const PROCESS    = 9;
+
     public const SETTINGS   = 10;
 }
diff --git a/Models/Process.php b/Models/Process.php
index d6df00f..57d2e4f 100755
--- a/Models/Process.php
+++ b/Models/Process.php
@@ -33,6 +33,7 @@ class Process
     protected int $id = 0;
 
     private $title = '';
+
     /**
      * Description.
      *
@@ -40,6 +41,7 @@ class Process
      * @since 1.0.0
      */
     private string $description = '';
+
     /**
      * Description.
      *
diff --git a/Models/Risk.php b/Models/Risk.php
index 08076ab..0a0c5f7 100755
--- a/Models/Risk.php
+++ b/Models/Risk.php
@@ -39,6 +39,7 @@ class Risk
      * @since 1.0.0
      */
     private string $name = '';
+
     /**
      * Description.
      *
@@ -46,6 +47,7 @@ class Risk
      * @since 1.0.0
      */
     private string $description = '';
+
     /**
      * Description.
      *
diff --git a/Models/RiskObject.php b/Models/RiskObject.php
index 926cb96..2a9077c 100755
--- a/Models/RiskObject.php
+++ b/Models/RiskObject.php
@@ -33,6 +33,7 @@ class RiskObject
     protected int $id = 0;
 
     private $title = '';
+
     /**
      * Description.
      *
@@ -40,6 +41,7 @@ class RiskObject
      * @since 1.0.0
      */
     private string $description = '';
+
     /**
      * Description.
      *
diff --git a/Models/Solution.php b/Models/Solution.php
index 96c0d6c..4be29d6 100755
--- a/Models/Solution.php
+++ b/Models/Solution.php
@@ -33,6 +33,7 @@ class Solution
     protected int $id = 0;
 
     private $title = '';
+
     /**
      * Description.
      *
@@ -40,6 +41,7 @@ class Solution
      * @since 1.0.0
      */
     private string $description = '';
+
     /**
      * Description.
      *
diff --git a/Theme/Backend/category-list.tpl.php b/Theme/Backend/category-list.tpl.php
index 4039879..7f82c7d 100755
--- a/Theme/Backend/category-list.tpl.php
+++ b/Theme/Backend/category-list.tpl.php
@@ -19,11 +19,11 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <div class="box wf-100">
             <table class="default">
-                <caption><?= $this->getHtml('Categories') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                <caption><?= $this->getHtml('Categories'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
-                    <td class="wf-100"><?= $this->getHtml('Title') ?>
+                    <td class="wf-100"><?= $this->getHtml('Title'); ?>
                         <tfoot>
                 <tr><td colspan="3">
                         <tbody>
diff --git a/Theme/Backend/cause-list.tpl.php b/Theme/Backend/cause-list.tpl.php
index ebdc3a9..2f0a3d5 100755
--- a/Theme/Backend/cause-list.tpl.php
+++ b/Theme/Backend/cause-list.tpl.php
@@ -19,12 +19,12 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <div class="box wf-100">
             <table class="default">
-                <caption><?= $this->getHtml('Causes') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                <caption><?= $this->getHtml('Causes'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
-                    <td class="wf-100"><?= $this->getHtml('Title') ?>
-                    <td><?= $this->getHtml('Risk') ?>
+                    <td class="wf-100"><?= $this->getHtml('Title'); ?>
+                    <td><?= $this->getHtml('Risk'); ?>
                         <tfoot>
                 <tr><td colspan="3">
                         <tbody>
diff --git a/Theme/Backend/cockpit.tpl.php b/Theme/Backend/cockpit.tpl.php
index 5988716..4f845f8 100755
--- a/Theme/Backend/cockpit.tpl.php
+++ b/Theme/Backend/cockpit.tpl.php
@@ -29,16 +29,16 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12 col-md-9">
         <div class="box wf-100">
             <table class="default">
-                <caption><?= $this->getHtml('TopRisks') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                <caption><?= $this->getHtml('TopRisks'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                 <thead>
                 <tr>
-                    <td><?= $this->getHtml('Severity') ?>
-                    <td class="wf-100"><?= $this->getHtml('Name') ?>
-                    <td><?= $this->getHtml('Department') ?>
-                    <td><?= $this->getHtml('Category') ?>
-                    <td><?= $this->getHtml('Process') ?>
-                    <td><?= $this->getHtml('Project') ?>
-                    <td><?= $this->getHtml('Unit') ?>
+                    <td><?= $this->getHtml('Severity'); ?>
+                    <td class="wf-100"><?= $this->getHtml('Name'); ?>
+                    <td><?= $this->getHtml('Department'); ?>
+                    <td><?= $this->getHtml('Category'); ?>
+                    <td><?= $this->getHtml('Process'); ?>
+                    <td><?= $this->getHtml('Project'); ?>
+                    <td><?= $this->getHtml('Unit'); ?>
                 <tfoot>
                 <tr><td colspan="6">
                 <tbody>
@@ -62,38 +62,38 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12 col-md-3">
         <section class="box wf-100">
             <div class="inner">
-                <a tabindex="0" class="button" href="<?= \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/risk/create'); ?>"><?= $this->getHtml('NewRisk') ?></a>
+                <a tabindex="0" class="button" href="<?= \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/risk/create'); ?>"><?= $this->getHtml('NewRisk'); ?></a>
             </div>
         </section>
 
         <section class="box wf-100">
-            <header><h1><?= $this->getHtml('Statistics') ?></h1></header>
+            <header><h1><?= $this->getHtml('Statistics'); ?></h1></header>
             <div class="inner">
                 <table class="list">
                     <thead>
                     <tr>
-                        <th><?= $this->getHtml('Risks') ?>
+                        <th><?= $this->getHtml('Risks'); ?>
                         <td>0
                     <tr>
-                        <th><?= $this->getHtml('Causes') ?>
+                        <th><?= $this->getHtml('Causes'); ?>
                         <td>0
                     <tr>
-                        <th><?= $this->getHtml('Solutions') ?>
+                        <th><?= $this->getHtml('Solutions'); ?>
                         <td>0
                     <tr>
-                        <th><?= $this->getHtml('Department') ?>
+                        <th><?= $this->getHtml('Department'); ?>
                         <td>0
                     <tr>
-                        <th><?= $this->getHtml('Category') ?>
+                        <th><?= $this->getHtml('Category'); ?>
                         <td>0
                     <tr>
-                        <th><?= $this->getHtml('Process') ?>
+                        <th><?= $this->getHtml('Process'); ?>
                         <td>0
                     <tr>
-                        <th><?= $this->getHtml('Project') ?>
+                        <th><?= $this->getHtml('Project'); ?>
                         <td>0
                     <tr>
-                        <th><?= $this->getHtml('Total') ?>
+                        <th><?= $this->getHtml('Total'); ?>
                         <td>0
                 </table>
             </div>
diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php
index 06f778b..376cf30 100755
--- a/Theme/Backend/department-list.tpl.php
+++ b/Theme/Backend/department-list.tpl.php
@@ -19,11 +19,11 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <div class="box wf-100">
             <table class="default">
-                <caption><?= $this->getHtml('Departments') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                <caption><?= $this->getHtml('Departments'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
-                    <td class="wf-100"><?= $this->getHtml('Title') ?>
+                    <td class="wf-100"><?= $this->getHtml('Title'); ?>
                         <tfoot>
                 <tr><td colspan="3">
                         <tbody>
diff --git a/Theme/Backend/department-single.tpl.php b/Theme/Backend/department-single.tpl.php
index 4e19e60..cd7356d 100755
--- a/Theme/Backend/department-single.tpl.php
+++ b/Theme/Backend/department-single.tpl.php
@@ -28,26 +28,26 @@ echo $this->getData('nav')->render(); ?>
         </ul>
     </div>
     <div class="tab-content">
-        <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Department') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Department'); ?></h1></header>
 
                         <div class="inner">
                             <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td><?= $this->getHtml('Name') ?></label><td><?= $this->printHtml($department->getDepartment()->getName()); ?>
-                                    <tr><td><?= $this->getHtml('Description') ?>:<td><?= $this->printHtml($department->getDepartment()->getDescription()); ?>
-                                    <tr><td><?= $this->getHtml('Unit') ?>:<td><?= $this->printHtml($department->getDepartment()->getUnit()->getName()); ?>
-                                    <tr><td><?= $this->getHtml('Risks') ?>:<td>
-                                    <tr><td><?= $this->getHtml('Categories') ?>:<td>
-                                    <tr><td><?= $this->getHtml('Projects') ?>:<td>
-                                    <tr><td><?= $this->getHtml('Processes') ?>:<td>
-                                    <tr><td><?= $this->getHtml('Causes') ?>:<td>
-                                    <tr><td><?= $this->getHtml('Solutions') ?>:<td>
+                                    <tr><td><?= $this->getHtml('Name'); ?></label><td><?= $this->printHtml($department->getDepartment()->getName()); ?>
+                                    <tr><td><?= $this->getHtml('Description'); ?>:<td><?= $this->printHtml($department->getDepartment()->getDescription()); ?>
+                                    <tr><td><?= $this->getHtml('Unit'); ?>:<td><?= $this->printHtml($department->getDepartment()->getUnit()->getName()); ?>
+                                    <tr><td><?= $this->getHtml('Risks'); ?>:<td>
+                                    <tr><td><?= $this->getHtml('Categories'); ?>:<td>
+                                    <tr><td><?= $this->getHtml('Projects'); ?>:<td>
+                                    <tr><td><?= $this->getHtml('Processes'); ?>:<td>
+                                    <tr><td><?= $this->getHtml('Causes'); ?>:<td>
+                                    <tr><td><?= $this->getHtml('Solutions'); ?>:<td>
                                 </table>
                             </form>
                         </div>
@@ -56,15 +56,15 @@ echo $this->getData('nav')->render(); ?>
 
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Media') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Media'); ?></h1></header>
 
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media') ?></label>
-                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select') ?></button>
-                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload') ?></label>
+                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media'); ?></label>
+                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select'); ?></button>
+                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload'); ?></label>
                                     <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
                                 </table>
                             </form>
@@ -76,13 +76,13 @@ echo $this->getData('nav')->render(); ?>
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Responsibility') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Responsibility'); ?></h1></header>
 
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td><label for="iResponsibility"><?= $this->getHtml('Responsibility') ?></label><td><label for="iUser"><?= $this->getHtml('UserGroup') ?></label><td>
+                                    <tr><td><label for="iResponsibility"><?= $this->getHtml('Responsibility'); ?></label><td><label for="iUser"><?= $this->getHtml('UserGroup'); ?></label><td>
                                     <tr><td><select id="iStatus" name="status">
                                                 <option value="">
                                             </select>
@@ -94,20 +94,20 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <div class="box wf-100">
                         <table class="default">
-                            <caption><?= $this->getHtml('Risks') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                            <caption><?= $this->getHtml('Risks'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                             <thead>
                             <tr>
                                 <td><?= $this->getHtml('ID', '0', '0'); ?>
-                                <td class="wf-100"><?= $this->getHtml('Title') ?>
-                                <td><?= $this->getHtml('Causes') ?>
-                                <td><?= $this->getHtml('Solutions') ?>
-                                <td><?= $this->getHtml('RiskObjects') ?>
+                                <td class="wf-100"><?= $this->getHtml('Title'); ?>
+                                <td><?= $this->getHtml('Causes'); ?>
+                                <td><?= $this->getHtml('Solutions'); ?>
+                                <td><?= $this->getHtml('RiskObjects'); ?>
                                     <tfoot>
                             <tr><td colspan="5">
                                     <tbody>
@@ -128,17 +128,17 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-3" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-3' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-3" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-3' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <div class="box wf-100">
                         <table class="default">
-                            <caption><?= $this->getHtml('Categories') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                            <caption><?= $this->getHtml('Categories'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                             <thead>
                             <tr>
                                 <td><?= $this->getHtml('ID', '0', '0'); ?>
-                                <td class="wf-100"><?= $this->getHtml('Title') ?>
+                                <td class="wf-100"><?= $this->getHtml('Title'); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
@@ -156,17 +156,17 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-4' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-4' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <div class="box wf-100">
                         <table class="default">
-                            <caption><?= $this->getHtml('Projects') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                            <caption><?= $this->getHtml('Projects'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                             <thead>
                             <tr>
                                 <td><?= $this->getHtml('ID', '0', '0'); ?>
-                                <td class="wf-100"><?= $this->getHtml('Title') ?>
+                                <td class="wf-100"><?= $this->getHtml('Title'); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
@@ -184,17 +184,17 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-5' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-5' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <div class="box wf-100">
                         <table class="default">
-                            <caption><?= $this->getHtml('Processes') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                            <caption><?= $this->getHtml('Processes'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                             <thead>
                             <tr>
                                 <td><?= $this->getHtml('ID', '0', '0'); ?>
-                                <td class="wf-100"><?= $this->getHtml('Title') ?>
+                                <td class="wf-100"><?= $this->getHtml('Title'); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
@@ -212,18 +212,18 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-6" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-6' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-6" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-6' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <div class="box wf-100">
                         <table class="default">
-                            <caption><?= $this->getHtml('Causes') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                            <caption><?= $this->getHtml('Causes'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                             <thead>
                             <tr>
                                 <td><?= $this->getHtml('ID', '0', '0'); ?>
-                                <td class="wf-100"><?= $this->getHtml('Title') ?>
-                                <td><?= $this->getHtml('Risk') ?>
+                                <td class="wf-100"><?= $this->getHtml('Title'); ?>
+                                <td><?= $this->getHtml('Risk'); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
@@ -242,19 +242,19 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-7" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-7' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-7" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-7' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <div class="box wf-100">
                         <table class="default">
-                            <caption><?= $this->getHtml('Solutions') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                            <caption><?= $this->getHtml('Solutions'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                             <thead>
                             <tr>
                                 <td><?= $this->getHtml('ID', '0', '0'); ?>
-                                <td class="wf-100"><?= $this->getHtml('Title') ?>
-                                <td><?= $this->getHtml('Risk') ?>
-                                <td><?= $this->getHtml('Cause') ?>
+                                <td class="wf-100"><?= $this->getHtml('Title'); ?>
+                                <td><?= $this->getHtml('Risk'); ?>
+                                <td><?= $this->getHtml('Cause'); ?>
                                     <tfoot>
                             <tr><td colspan="4">
                                     <tbody>
diff --git a/Theme/Backend/process-list.tpl.php b/Theme/Backend/process-list.tpl.php
index 70ff667..8c814f3 100755
--- a/Theme/Backend/process-list.tpl.php
+++ b/Theme/Backend/process-list.tpl.php
@@ -19,11 +19,11 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <div class="box wf-100">
             <table class="default">
-                <caption><?= $this->getHtml('Processes') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                <caption><?= $this->getHtml('Processes'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
-                    <td class="wf-100"><?= $this->getHtml('Title') ?>
+                    <td class="wf-100"><?= $this->getHtml('Title'); ?>
                         <tfoot>
                 <tr><td colspan="3">
                         <tbody>
diff --git a/Theme/Backend/project-list.tpl.php b/Theme/Backend/project-list.tpl.php
index 9f01715..c9e7d83 100755
--- a/Theme/Backend/project-list.tpl.php
+++ b/Theme/Backend/project-list.tpl.php
@@ -19,11 +19,11 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <div class="box wf-100">
             <table class="default">
-                <caption><?= $this->getHtml('Projects') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                <caption><?= $this->getHtml('Projects'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
-                    <td class="wf-100"><?= $this->getHtml('Title') ?>
+                    <td class="wf-100"><?= $this->getHtml('Title'); ?>
                         <tfoot>
                 <tr><td colspan="3">
                         <tbody>
diff --git a/Theme/Backend/risk-create.tpl.php b/Theme/Backend/risk-create.tpl.php
index 5c473fa..c7a8d93 100755
--- a/Theme/Backend/risk-create.tpl.php
+++ b/Theme/Backend/risk-create.tpl.php
@@ -25,32 +25,32 @@ echo $this->getData('nav')->render(); ?>
         </ul>
     </div>
     <div class="tab-content">
-        <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Risk') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Risk'); ?></h1></header>
 
                         <div class="inner">
                             <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td><label for="iName"><?= $this->getHtml('Name') ?></label>
-                                    <tr><td><input type="text" id="iName" name="name" placeholder="&#xf040; <?= $this->getHtml('Name') ?>" required>
-                                    <tr><td><label for="iDescription"><?= $this->getHtml('Description') ?></label>
+                                    <tr><td><label for="iName"><?= $this->getHtml('Name'); ?></label>
+                                    <tr><td><input type="text" id="iName" name="name" placeholder="&#xf040; <?= $this->getHtml('Name'); ?>" required>
+                                    <tr><td><label for="iDescription"><?= $this->getHtml('Description'); ?></label>
                                     <tr><td><textarea id="iDescription" name="description"></textarea>
-                                    <tr><td><label for="iUnit"><?= $this->getHtml('Unit') ?></label>
+                                    <tr><td><label for="iUnit"><?= $this->getHtml('Unit'); ?></label>
                                     <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" name="unit" id="iUnit"></span>
-                                    <tr><td><label for="iCategory"><?= $this->getHtml('Category') ?></label>
+                                    <tr><td><label for="iCategory"><?= $this->getHtml('Category'); ?></label>
                                     <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" name="category" id="iCategory"></span>
-                                    <tr><td><label for="iDepartment"><?= $this->getHtml('Department') ?></label>
+                                    <tr><td><label for="iDepartment"><?= $this->getHtml('Department'); ?></label>
                                     <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" name="department" id="iDepartment"></span>
-                                    <tr><td><label for="iProcess"><?= $this->getHtml('Process') ?></label>
+                                    <tr><td><label for="iProcess"><?= $this->getHtml('Process'); ?></label>
                                     <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" name="process" id="iProcess"></span>
-                                    <tr><td><label for="iProject"><?= $this->getHtml('Project') ?></label>
+                                    <tr><td><label for="iProject"><?= $this->getHtml('Project'); ?></label>
                                     <tr><td><span class="input"><button type="button" formaction=""><i class="fa fa-book"></i></button><input type="text" name="project" id="iProject"></span>
-                                    <tr><td><label for="iReview"><?= $this->getHtml('Review') ?></label>
+                                    <tr><td><label for="iReview"><?= $this->getHtml('Review'); ?></label>
                                     <tr><td><input type="datetime-local" id="iReview" name="Review" value="<?= $this->printHtml((new \DateTime('NOW'))->format('Y-m-d\TH:i:s')); ?>">
                                     <tr><td><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
                                 </table>
@@ -61,15 +61,15 @@ echo $this->getData('nav')->render(); ?>
 
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Media') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Media'); ?></h1></header>
 
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media') ?></label>
-                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select') ?></button>
-                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload') ?></label>
+                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media'); ?></label>
+                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select'); ?></button>
+                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload'); ?></label>
                                     <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
                                 </table>
                             </form>
@@ -81,13 +81,13 @@ echo $this->getData('nav')->render(); ?>
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Responsibility') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Responsibility'); ?></h1></header>
 
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td><label for="iResponsibility"><?= $this->getHtml('Responsibility') ?></label><td><label for="iUser"><?= $this->getHtml('UserGroup') ?></label><td>
+                                    <tr><td><label for="iResponsibility"><?= $this->getHtml('Responsibility'); ?></label><td><label for="iUser"><?= $this->getHtml('UserGroup'); ?></label><td>
                                     <tr><td><select id="iStatus" name="status">
                                                 <option value="">
                                             </select>
@@ -99,34 +99,34 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('RiskStatus') ?></h1></header>
+                        <header><h1><?= $this->getHtml('RiskStatus'); ?></h1></header>
 
                         <div class="inner">
                             <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td><label for="iRiskConsequence"><?= $this->getHtml('RiskConsequence') ?></label>
+                                    <tr><td><label for="iRiskConsequence"><?= $this->getHtml('RiskConsequence'); ?></label>
                                     <tr><td><select id="iRiskConsequence" name="riskconsequence">
 
                                             </select>
-                                    <tr><td><label for="iRiskLikelihood"><?= $this->getHtml('RiskLikelihood') ?></label>
+                                    <tr><td><label for="iRiskLikelihood"><?= $this->getHtml('RiskLikelihood'); ?></label>
                                     <tr><td><select id="iRiskLikelihood" name="risklikelihood">
 
                                             </select>
-                                    <tr><td><label for="iRiskConsequence"><?= $this->getHtml('RiskConsequence') ?></label>
+                                    <tr><td><label for="iRiskConsequence"><?= $this->getHtml('RiskConsequence'); ?></label>
                                     <tr><td><select id="iRiskConsequence" name="riskconsequence">
 
                                             </select>
-                                    <tr><td><label for="iRiskLikelihood"><?= $this->getHtml('RiskLikelihood') ?></label>
+                                    <tr><td><label for="iRiskLikelihood"><?= $this->getHtml('RiskLikelihood'); ?></label>
                                     <tr><td><select id="iRiskLikelihood" name="risklikelihood">
 
                                             </select>
-                                    <tr><td><label for="iRiskStatusDescription"><?= $this->getHtml('Description') ?></label>
+                                    <tr><td><label for="iRiskStatusDescription"><?= $this->getHtml('Description'); ?></label>
                                     <tr><td><textarea id="iRiskStatusDescription" name="riskstatusdescription"></textarea>
                                     <tr><td><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
                                 </table>
@@ -137,15 +137,15 @@ echo $this->getData('nav')->render(); ?>
 
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Media') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Media'); ?></h1></header>
 
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media') ?></label>
-                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select') ?></button>
-                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload') ?></label>
+                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media'); ?></label>
+                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select'); ?></button>
+                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload'); ?></label>
                                     <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
                                 </table>
                             </form>
@@ -154,20 +154,20 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-3" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-3' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-3" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-3' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('RiskObjects') ?></h1></header>
+                        <header><h1><?= $this->getHtml('RiskObjects'); ?></h1></header>
 
                         <div class="inner">
                             <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td><label for="iRiskObjectName"><?= $this->getHtml('Name') ?></label>
-                                    <tr><td><input type="text" id="iRiskObjectName" name="riskobjectname" placeholder="&#xf040; <?= $this->getHtml('Name') ?>">
-                                    <tr><td><label for="iRiskObjectDescription"><?= $this->getHtml('Description') ?></label>
+                                    <tr><td><label for="iRiskObjectName"><?= $this->getHtml('Name'); ?></label>
+                                    <tr><td><input type="text" id="iRiskObjectName" name="riskobjectname" placeholder="&#xf040; <?= $this->getHtml('Name'); ?>">
+                                    <tr><td><label for="iRiskObjectDescription"><?= $this->getHtml('Description'); ?></label>
                                     <tr><td><textarea id="iRiskObjectDescription" name="riskobjectdescription"></textarea>
                                     <tr><td><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
                                 </table>
@@ -178,15 +178,15 @@ echo $this->getData('nav')->render(); ?>
 
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Media') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Media'); ?></h1></header>
 
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media') ?></label>
-                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select') ?></button>
-                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload') ?></label>
+                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media'); ?></label>
+                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select'); ?></button>
+                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload'); ?></label>
                                     <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
                                 </table>
                             </form>
@@ -195,24 +195,24 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-4' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-4' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('RiskObjectStatus') ?></h1></header>
+                        <header><h1><?= $this->getHtml('RiskObjectStatus'); ?></h1></header>
 
                         <div class="inner">
                             <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td><label for="iRiskObjectNameValue"><?= $this->getHtml('RiskObject') ?></label>
+                                    <tr><td><label for="iRiskObjectNameValue"><?= $this->getHtml('RiskObject'); ?></label>
                                     <tr><td><select id="iRiskObjectNameValue" name="riskobjectnamevalue">
 
                                             </select>
-                                    <tr><td><label for="iRiskObjecValue"><?= $this->getHtml('Value') ?></label>
+                                    <tr><td><label for="iRiskObjecValue"><?= $this->getHtml('Value'); ?></label>
                                     <tr><td><input type="text" id="iRiskObjecValue" name="riskobjectvalue">
-                                    <tr><td><label for="iRiskObjecValueDescription"><?= $this->getHtml('Description') ?></label>
+                                    <tr><td><label for="iRiskObjecValueDescription"><?= $this->getHtml('Description'); ?></label>
                                     <tr><td><textarea id="iRiskObjecValueDescription" name="riskobjectvaluedescription"></textarea>
                                     <tr><td><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
                                 </table>
@@ -223,15 +223,15 @@ echo $this->getData('nav')->render(); ?>
 
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Media') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Media'); ?></h1></header>
 
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media') ?></label>
-                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select') ?></button>
-                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload') ?></label>
+                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media'); ?></label>
+                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select'); ?></button>
+                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload'); ?></label>
                                     <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
                                 </table>
                             </form>
@@ -240,25 +240,25 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-5' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-5' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Solution') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Solution'); ?></h1></header>
 
                         <div class="inner">
                             <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td><label for="iSolutionName"><?= $this->getHtml('Name') ?></label>
+                                    <tr><td><label for="iSolutionName"><?= $this->getHtml('Name'); ?></label>
                                     <tr><td><input type="text" id="iSolutionName" name="solutionname">
-                                    <tr><td><label for="iSolutioType"><?= $this->getHtml('Type') ?></label>
+                                    <tr><td><label for="iSolutioType"><?= $this->getHtml('Type'); ?></label>
                                     <tr><td><select id="iSolutioType" name="solutiontype">
                                                 <option>Preventing
                                                 <option>Disclosing
                                             </select>
-                                    <tr><td><label for="iSolutioFrequency"><?= $this->getHtml('Frequency') ?></label>
+                                    <tr><td><label for="iSolutioFrequency"><?= $this->getHtml('Frequency'); ?></label>
                                     <tr><td><select id="iSolutioFrequency" name="solutionfrequency">
                                                 <option>Permanently
                                                 <option>Daily
@@ -268,13 +268,13 @@ echo $this->getData('nav')->render(); ?>
                                                 <option>Semiannual
                                                 <option>Annual
                                             </select>
-                                    <tr><td><label for="iSolutioAssessment"><?= $this->getHtml('Assessment') ?></label>
+                                    <tr><td><label for="iSolutioAssessment"><?= $this->getHtml('Assessment'); ?></label>
                                     <tr><td><select id="iSolutioAssessment" name="solutionassessment">
                                                 <option>Manual
                                                 <option>IT-dependent
                                                 <option>IT
                                             </select>
-                                    <tr><td><label for="iSolutionDescription"><?= $this->getHtml('Description') ?></label>
+                                    <tr><td><label for="iSolutionDescription"><?= $this->getHtml('Description'); ?></label>
                                     <tr><td><textarea id="iSolutionDescription" name="solutionDescription"></textarea>
                                     <tr><td><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
                                 </table>
@@ -285,15 +285,15 @@ echo $this->getData('nav')->render(); ?>
 
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Media') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Media'); ?></h1></header>
 
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media') ?></label>
-                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select') ?></button>
-                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload') ?></label>
+                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media'); ?></label>
+                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select'); ?></button>
+                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload'); ?></label>
                                     <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
                                 </table>
                             </form>
diff --git a/Theme/Backend/risk-list.tpl.php b/Theme/Backend/risk-list.tpl.php
index ea40841..533718b 100755
--- a/Theme/Backend/risk-list.tpl.php
+++ b/Theme/Backend/risk-list.tpl.php
@@ -19,14 +19,14 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <div class="box wf-100">
             <table class="default">
-                <caption><?= $this->getHtml('Risks') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                <caption><?= $this->getHtml('Risks'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
-                    <td class="wf-100"><?= $this->getHtml('Title') ?>
-                    <td><?= $this->getHtml('Causes') ?>
-                    <td><?= $this->getHtml('Solutions') ?>
-                    <td><?= $this->getHtml('RiskObjects') ?>
+                    <td class="wf-100"><?= $this->getHtml('Title'); ?>
+                    <td><?= $this->getHtml('Causes'); ?>
+                    <td><?= $this->getHtml('Solutions'); ?>
+                    <td><?= $this->getHtml('RiskObjects'); ?>
                         <tfoot>
                 <tr><td colspan="5">
                         <tbody>
diff --git a/Theme/Backend/risk-single.tpl.php b/Theme/Backend/risk-single.tpl.php
index 0bb7fdd..2efd5b0 100755
--- a/Theme/Backend/risk-single.tpl.php
+++ b/Theme/Backend/risk-single.tpl.php
@@ -26,24 +26,24 @@ echo $this->getData('nav')->render(); ?>
         </ul>
     </div>
     <div class="tab-content">
-        <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Risk') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Risk'); ?></h1></header>
 
                         <div class="inner">
                             <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td><?= $this->getHtml('Name') ?><td><?= $this->printHtml($risk->getName()); ?>
-                                    <tr><td><?= $this->getHtml('Description') ?><td><?= $this->printHtml($risk->getDescription()); ?>
-                                    <tr><td><?= $this->getHtml('Unit') ?><td><?= $this->printHtml($risk->getUnit()->getName()); ?>
-                                    <tr><td><?= $this->getHtml('Category') ?><td><?= $this->printHtml($risk->getCategory()->getTitle()); ?>
-                                    <tr><td><?= $this->getHtml('Department') ?><td><?= $this->printHtml($risk->getDepartment()->getDepartment()->getName()); ?>
-                                    <tr><td><?= $this->getHtml('Process') ?><td><?= $this->printHtml($risk->getProcess()->getTitle()); ?>
-                                    <tr><td><?= $this->getHtml('Project') ?><td><?= $this->printHtml($risk->getProject()->getProject()->getName()); ?>
+                                    <tr><td><?= $this->getHtml('Name'); ?><td><?= $this->printHtml($risk->getName()); ?>
+                                    <tr><td><?= $this->getHtml('Description'); ?><td><?= $this->printHtml($risk->getDescription()); ?>
+                                    <tr><td><?= $this->getHtml('Unit'); ?><td><?= $this->printHtml($risk->getUnit()->getName()); ?>
+                                    <tr><td><?= $this->getHtml('Category'); ?><td><?= $this->printHtml($risk->getCategory()->getTitle()); ?>
+                                    <tr><td><?= $this->getHtml('Department'); ?><td><?= $this->printHtml($risk->getDepartment()->getDepartment()->getName()); ?>
+                                    <tr><td><?= $this->getHtml('Process'); ?><td><?= $this->printHtml($risk->getProcess()->getTitle()); ?>
+                                    <tr><td><?= $this->getHtml('Project'); ?><td><?= $this->printHtml($risk->getProject()->getProject()->getName()); ?>
                                 </table>
                             </form>
                         </div>
@@ -52,15 +52,15 @@ echo $this->getData('nav')->render(); ?>
 
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Media') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Media'); ?></h1></header>
 
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media') ?></label>
-                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select') ?></button>
-                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload') ?></label>
+                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media'); ?></label>
+                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select'); ?></button>
+                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload'); ?></label>
                                     <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
                                 </table>
                             </form>
@@ -72,13 +72,13 @@ echo $this->getData('nav')->render(); ?>
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Responsibility') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Responsibility'); ?></h1></header>
 
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td><label for="iResponsibility"><?= $this->getHtml('Responsibility') ?></label><td><label for="iUser"><?= $this->getHtml('UserGroup') ?></label><td>
+                                    <tr><td><label for="iResponsibility"><?= $this->getHtml('Responsibility'); ?></label><td><label for="iUser"><?= $this->getHtml('UserGroup'); ?></label><td>
                                     <tr><td><select id="iStatus" name="status">
                                                 <option value="">
                                             </select>
@@ -90,34 +90,34 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('RiskStatus') ?></h1></header>
+                        <header><h1><?= $this->getHtml('RiskStatus'); ?></h1></header>
 
                         <div class="inner">
                             <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td><label for="iRiskConsequence"><?= $this->getHtml('RiskConsequence') ?></label>
+                                    <tr><td><label for="iRiskConsequence"><?= $this->getHtml('RiskConsequence'); ?></label>
                                     <tr><td><select id="iRiskConsequence" name="riskconsequence">
 
                                             </select>
-                                    <tr><td><label for="iRiskLikelihood"><?= $this->getHtml('RiskLikelihood') ?></label>
+                                    <tr><td><label for="iRiskLikelihood"><?= $this->getHtml('RiskLikelihood'); ?></label>
                                     <tr><td><select id="iRiskLikelihood" name="risklikelihood">
 
                                             </select>
-                                    <tr><td><label for="iRiskConsequence"><?= $this->getHtml('RiskConsequence') ?></label>
+                                    <tr><td><label for="iRiskConsequence"><?= $this->getHtml('RiskConsequence'); ?></label>
                                     <tr><td><select id="iRiskConsequence" name="riskconsequence">
 
                                             </select>
-                                    <tr><td><label for="iRiskLikelihood"><?= $this->getHtml('RiskLikelihood') ?></label>
+                                    <tr><td><label for="iRiskLikelihood"><?= $this->getHtml('RiskLikelihood'); ?></label>
                                     <tr><td><select id="iRiskLikelihood" name="risklikelihood">
 
                                             </select>
-                                    <tr><td><label for="iRiskStatusDescription"><?= $this->getHtml('Description') ?></label>
+                                    <tr><td><label for="iRiskStatusDescription"><?= $this->getHtml('Description'); ?></label>
                                     <tr><td><textarea id="iRiskStatusDescription" name="riskstatusdescription"></textarea>
                                     <tr><td><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
                                 </table>
@@ -128,15 +128,15 @@ echo $this->getData('nav')->render(); ?>
 
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Media') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Media'); ?></h1></header>
 
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media') ?></label>
-                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select') ?></button>
-                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload') ?></label>
+                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media'); ?></label>
+                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select'); ?></button>
+                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload'); ?></label>
                                     <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
                                 </table>
                             </form>
@@ -145,20 +145,20 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-3" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-3' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-3" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-3' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('RiskObjects') ?></h1></header>
+                        <header><h1><?= $this->getHtml('RiskObjects'); ?></h1></header>
 
                         <div class="inner">
                             <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td><label for="iRiskObjectName"><?= $this->getHtml('Name') ?></label>
-                                    <tr><td><input type="text" id="iRiskObjectName" name="riskobjectname" placeholder="&#xf040; <?= $this->getHtml('Name') ?>">
-                                    <tr><td><label for="iRiskObjectDescription"><?= $this->getHtml('Description') ?></label>
+                                    <tr><td><label for="iRiskObjectName"><?= $this->getHtml('Name'); ?></label>
+                                    <tr><td><input type="text" id="iRiskObjectName" name="riskobjectname" placeholder="&#xf040; <?= $this->getHtml('Name'); ?>">
+                                    <tr><td><label for="iRiskObjectDescription"><?= $this->getHtml('Description'); ?></label>
                                     <tr><td><textarea id="iRiskObjectDescription" name="riskobjectdescription"></textarea>
                                     <tr><td><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
                                 </table>
@@ -169,15 +169,15 @@ echo $this->getData('nav')->render(); ?>
 
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Media') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Media'); ?></h1></header>
 
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media') ?></label>
-                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select') ?></button>
-                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload') ?></label>
+                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media'); ?></label>
+                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select'); ?></button>
+                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload'); ?></label>
                                     <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
                                 </table>
                             </form>
@@ -186,24 +186,24 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-4' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-4' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('RiskObjectStatus') ?></h1></header>
+                        <header><h1><?= $this->getHtml('RiskObjectStatus'); ?></h1></header>
 
                         <div class="inner">
                             <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td><label for="iRiskObjectNameValue"><?= $this->getHtml('RiskObject') ?></label>
+                                    <tr><td><label for="iRiskObjectNameValue"><?= $this->getHtml('RiskObject'); ?></label>
                                     <tr><td><select id="iRiskObjectNameValue" name="riskobjectnamevalue">
 
                                             </select>
-                                    <tr><td><label for="iRiskObjecValue"><?= $this->getHtml('Value') ?></label>
+                                    <tr><td><label for="iRiskObjecValue"><?= $this->getHtml('Value'); ?></label>
                                     <tr><td><input type="text" id="iRiskObjecValue" name="riskobjectvalue">
-                                    <tr><td><label for="iRiskObjecValueDescription"><?= $this->getHtml('Description') ?></label>
+                                    <tr><td><label for="iRiskObjecValueDescription"><?= $this->getHtml('Description'); ?></label>
                                     <tr><td><textarea id="iRiskObjecValueDescription" name="riskobjectvaluedescription"></textarea>
                                     <tr><td><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
                                 </table>
@@ -214,15 +214,15 @@ echo $this->getData('nav')->render(); ?>
 
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Media') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Media'); ?></h1></header>
 
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media') ?></label>
-                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select') ?></button>
-                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload') ?></label>
+                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media'); ?></label>
+                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select'); ?></button>
+                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload'); ?></label>
                                     <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
                                 </table>
                             </form>
@@ -231,25 +231,25 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-5' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-5' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Solution') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Solution'); ?></h1></header>
 
                         <div class="inner">
                             <form id="fRisk"  method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td><label for="iSolutionName"><?= $this->getHtml('Name') ?></label>
+                                    <tr><td><label for="iSolutionName"><?= $this->getHtml('Name'); ?></label>
                                     <tr><td><input type="text" id="iSolutionName" name="solutionname">
-                                    <tr><td><label for="iSolutioType"><?= $this->getHtml('Type') ?></label>
+                                    <tr><td><label for="iSolutioType"><?= $this->getHtml('Type'); ?></label>
                                     <tr><td><select id="iSolutioType" name="solutiontype">
                                                 <option>Preventing
                                                 <option>Disclosing
                                             </select>
-                                    <tr><td><label for="iSolutioFrequency"><?= $this->getHtml('Frequency') ?></label>
+                                    <tr><td><label for="iSolutioFrequency"><?= $this->getHtml('Frequency'); ?></label>
                                     <tr><td><select id="iSolutioFrequency" name="solutionfrequency">
                                                 <option>Permanently
                                                 <option>Daily
@@ -259,13 +259,13 @@ echo $this->getData('nav')->render(); ?>
                                                 <option>Semiannual
                                                 <option>Annual
                                             </select>
-                                    <tr><td><label for="iSolutioAssessment"><?= $this->getHtml('Assessment') ?></label>
+                                    <tr><td><label for="iSolutioAssessment"><?= $this->getHtml('Assessment'); ?></label>
                                     <tr><td><select id="iSolutioAssessment" name="solutionassessment">
                                                 <option>Manual
                                                 <option>IT-dependent
                                                 <option>IT
                                             </select>
-                                    <tr><td><label for="iSolutionDescription"><?= $this->getHtml('Description') ?></label>
+                                    <tr><td><label for="iSolutionDescription"><?= $this->getHtml('Description'); ?></label>
                                     <tr><td><textarea id="iSolutionDescription" name="solutionDescription"></textarea>
                                     <tr><td><input type="submit" value="<?= $this->getHtml('Create', '0', '0'); ?>">
                                 </table>
@@ -276,15 +276,15 @@ echo $this->getData('nav')->render(); ?>
 
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Media') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Media'); ?></h1></header>
 
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media') ?></label>
-                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select') ?></button>
-                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload') ?></label>
+                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media'); ?></label>
+                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select'); ?></button>
+                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload'); ?></label>
                                     <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
                                 </table>
                             </form>
diff --git a/Theme/Backend/solution-list.tpl.php b/Theme/Backend/solution-list.tpl.php
index 33080a9..20cc11e 100755
--- a/Theme/Backend/solution-list.tpl.php
+++ b/Theme/Backend/solution-list.tpl.php
@@ -20,13 +20,13 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <div class="box wf-100">
             <table class="default">
-                <caption><?= $this->getHtml('Solutions') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                <caption><?= $this->getHtml('Solutions'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
-                    <td class="wf-100"><?= $this->getHtml('Title') ?>
-                    <td><?= $this->getHtml('Risk') ?>
-                    <td><?= $this->getHtml('Cause') ?>
+                    <td class="wf-100"><?= $this->getHtml('Title'); ?>
+                    <td><?= $this->getHtml('Risk'); ?>
+                    <td><?= $this->getHtml('Cause'); ?>
                         <tfoot>
                 <tr><td colspan="4">
                         <tbody>
diff --git a/Theme/Backend/unit-list.tpl.php b/Theme/Backend/unit-list.tpl.php
index 0579cf5..fac4d1b 100755
--- a/Theme/Backend/unit-list.tpl.php
+++ b/Theme/Backend/unit-list.tpl.php
@@ -19,11 +19,11 @@ echo $this->getData('nav')->render(); ?>
     <div class="col-xs-12">
         <div class="box wf-100">
             <table class="default">
-                <caption><?= $this->getHtml('Units') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                <caption><?= $this->getHtml('Units'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                 <thead>
                 <tr>
                     <td><?= $this->getHtml('ID', '0', '0'); ?>
-                    <td class="wf-100"><?= $this->getHtml('Name') ?>
+                    <td class="wf-100"><?= $this->getHtml('Name'); ?>
                         <tfoot>
                 <tr><td colspan="3">
                         <tbody>
diff --git a/Theme/Backend/unit-single.tpl.php b/Theme/Backend/unit-single.tpl.php
index 4c35e64..296d8f4 100755
--- a/Theme/Backend/unit-single.tpl.php
+++ b/Theme/Backend/unit-single.tpl.php
@@ -29,26 +29,26 @@ echo $this->getData('nav')->render(); ?>
         </ul>
     </div>
     <div class="tab-content">
-        <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-1" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Unit') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Unit'); ?></h1></header>
 
                         <div class="inner">
                             <form id="fRisk" method="POST" action="<?= \phpOMS\Uri\UriFactory::build('{/api}controlling/riskmanagement?{?}&csrf={$CSRF}'); ?>">
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td><?= $this->getHtml('Name') ?></label><td><?= $this->printHtml($unit->getName()); ?>
-                                    <tr><td><?= $this->getHtml('Description') ?>:<td><?= $this->printHtml($unit->getDescription()); ?>
-                                    <tr><td><?= $this->getHtml('Risks') ?>:<td>
-                                    <tr><td><?= $this->getHtml('Departments') ?>:<td>
-                                    <tr><td><?= $this->getHtml('Categories') ?>:<td>
-                                    <tr><td><?= $this->getHtml('Projects') ?>:<td>
-                                    <tr><td><?= $this->getHtml('Processes') ?>:<td>
-                                    <tr><td><?= $this->getHtml('Causes') ?>:<td>
-                                    <tr><td><?= $this->getHtml('Solutions') ?>:<td>
+                                    <tr><td><?= $this->getHtml('Name'); ?></label><td><?= $this->printHtml($unit->getName()); ?>
+                                    <tr><td><?= $this->getHtml('Description'); ?>:<td><?= $this->printHtml($unit->getDescription()); ?>
+                                    <tr><td><?= $this->getHtml('Risks'); ?>:<td>
+                                    <tr><td><?= $this->getHtml('Departments'); ?>:<td>
+                                    <tr><td><?= $this->getHtml('Categories'); ?>:<td>
+                                    <tr><td><?= $this->getHtml('Projects'); ?>:<td>
+                                    <tr><td><?= $this->getHtml('Processes'); ?>:<td>
+                                    <tr><td><?= $this->getHtml('Causes'); ?>:<td>
+                                    <tr><td><?= $this->getHtml('Solutions'); ?>:<td>
                                 </table>
                             </form>
                         </div>
@@ -57,15 +57,15 @@ echo $this->getData('nav')->render(); ?>
 
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Media') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Media'); ?></h1></header>
 
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media') ?></label>
-                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select') ?></button>
-                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload') ?></label>
+                                    <tr><td colspan="2"><label for="iMedia"><?= $this->getHtml('Media'); ?></label>
+                                    <tr><td><input type="text" id="iMedia" placeholder="&#xf15b; File"><td><button><?= $this->getHtml('Select'); ?></button>
+                                    <tr><td colspan="2"><label for="iUpload"><?= $this->getHtml('Upload'); ?></label>
                                     <tr><td><input type="file" id="iUpload" form="fTask"><input form="fTask" type="hidden" name="type"><td>
                                 </table>
                             </form>
@@ -77,13 +77,13 @@ echo $this->getData('nav')->render(); ?>
             <div class="row">
                 <div class="col-xs-12 col-md-6">
                     <section class="box wf-100">
-                        <header><h1><?= $this->getHtml('Responsibility') ?></h1></header>
+                        <header><h1><?= $this->getHtml('Responsibility'); ?></h1></header>
 
                         <div class="inner">
                             <form>
                                 <table class="layout wf-100">
                                     <tbody>
-                                    <tr><td><label for="iResponsibility"><?= $this->getHtml('Responsibility') ?></label><td><label for="iUser"><?= $this->getHtml('UserGroup') ?></label><td>
+                                    <tr><td><label for="iResponsibility"><?= $this->getHtml('Responsibility'); ?></label><td><label for="iUser"><?= $this->getHtml('UserGroup'); ?></label><td>
                                     <tr><td><select id="iStatus" name="status">
                                                 <option value="">
                                             </select>
@@ -95,20 +95,20 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-2" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <div class="box wf-100">
                         <table class="default">
-                            <caption><?= $this->getHtml('Risks') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                            <caption><?= $this->getHtml('Risks'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                             <thead>
                             <tr>
                                 <td><?= $this->getHtml('ID', '0', '0'); ?>
-                                <td class="wf-100"><?= $this->getHtml('Title') ?>
-                                <td><?= $this->getHtml('Causes') ?>
-                                <td><?= $this->getHtml('Solutions') ?>
-                                <td><?= $this->getHtml('RiskObjects') ?>
+                                <td class="wf-100"><?= $this->getHtml('Title'); ?>
+                                <td><?= $this->getHtml('Causes'); ?>
+                                <td><?= $this->getHtml('Solutions'); ?>
+                                <td><?= $this->getHtml('RiskObjects'); ?>
                                     <tfoot>
                             <tr><td colspan="5">
                                     <tbody>
@@ -129,17 +129,17 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-3" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-3' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-3" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-3' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <div class="box wf-100">
                         <table class="default">
-                            <caption><?= $this->getHtml('Departments') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                            <caption><?= $this->getHtml('Departments'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                             <thead>
                             <tr>
                                 <td><?= $this->getHtml('ID', '0', '0'); ?>
-                                <td class="wf-100"><?= $this->getHtml('Title') ?>
+                                <td class="wf-100"><?= $this->getHtml('Title'); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
@@ -157,17 +157,17 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-4' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-4" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-4' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <div class="box wf-100">
                         <table class="default">
-                            <caption><?= $this->getHtml('Categories') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                            <caption><?= $this->getHtml('Categories'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                             <thead>
                             <tr>
                                 <td><?= $this->getHtml('ID', '0', '0'); ?>
-                                <td class="wf-100"><?= $this->getHtml('Title') ?>
+                                <td class="wf-100"><?= $this->getHtml('Title'); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
@@ -185,17 +185,17 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-5' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-5" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-5' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <div class="box wf-100">
                         <table class="default">
-                            <caption><?= $this->getHtml('Projects') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                            <caption><?= $this->getHtml('Projects'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                             <thead>
                             <tr>
                                 <td><?= $this->getHtml('ID', '0', '0'); ?>
-                                <td class="wf-100"><?= $this->getHtml('Title') ?>
+                                <td class="wf-100"><?= $this->getHtml('Title'); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
@@ -213,17 +213,17 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-6" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-6' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-6" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-6' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <div class="box wf-100">
                         <table class="default">
-                            <caption><?= $this->getHtml('Processes') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                            <caption><?= $this->getHtml('Processes'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                             <thead>
                             <tr>
                                 <td><?= $this->getHtml('ID', '0', '0'); ?>
-                                <td class="wf-100"><?= $this->getHtml('Title') ?>
+                                <td class="wf-100"><?= $this->getHtml('Title'); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
@@ -241,18 +241,18 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-7" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-7' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-7" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-7' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <div class="box wf-100">
                         <table class="default">
-                            <caption><?= $this->getHtml('Causes') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                            <caption><?= $this->getHtml('Causes'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                             <thead>
                             <tr>
                                 <td><?= $this->getHtml('ID', '0', '0'); ?>
-                                <td class="wf-100"><?= $this->getHtml('Title') ?>
-                                <td><?= $this->getHtml('Risk') ?>
+                                <td class="wf-100"><?= $this->getHtml('Title'); ?>
+                                <td><?= $this->getHtml('Risk'); ?>
                                     <tfoot>
                             <tr><td colspan="3">
                                     <tbody>
@@ -271,19 +271,19 @@ echo $this->getData('nav')->render(); ?>
                 </div>
             </div>
         </div>
-        <input type="radio" id="c-tab-8" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-8' ? ' checked' : '' ?>>
+        <input type="radio" id="c-tab-8" name="tabular-2"<?= $this->request->getUri()->getFragment() === 'c-tab-8' ? ' checked' : ''; ?>>
         <div class="tab">
             <div class="row">
                 <div class="col-xs-12">
                     <div class="box wf-100">
                         <table class="default">
-                            <caption><?= $this->getHtml('Solutions') ?><i class="fa fa-download floatRight download btn"></i></caption>
+                            <caption><?= $this->getHtml('Solutions'); ?><i class="fa fa-download floatRight download btn"></i></caption>
                             <thead>
                             <tr>
                                 <td><?= $this->getHtml('ID', '0', '0'); ?>
-                                <td class="wf-100"><?= $this->getHtml('Title') ?>
-                                <td><?= $this->getHtml('Risk') ?>
-                                <td><?= $this->getHtml('Cause') ?>
+                                <td class="wf-100"><?= $this->getHtml('Title'); ?>
+                                <td><?= $this->getHtml('Risk'); ?>
+                                <td><?= $this->getHtml('Cause'); ?>
                                     <tfoot>
                             <tr><td colspan="4">
                                     <tbody>
diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php
index c8c3f4a..281a5d9 100755
--- a/tests/Admin/AdminTest.php
+++ b/tests/Admin/AdminTest.php
@@ -20,6 +20,7 @@ namespace Modules\RiskManagement\tests\Admin;
 class AdminTest extends \PHPUnit\Framework\TestCase
 {
     protected const MODULE_NAME = 'RiskManagement';
+
     protected const URI_LOAD = '';
 
     use \Modules\tests\ModuleTestTrait;