diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d44f65c..e942af8 100755
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup Composer
         run: composer install
       - name: Autoformat
-        run: 'vendor/bin/php-cs-fixer fix ./ --rules=''{"array_syntax": {"syntax": "short"}, "blank_line_after_namespace": true, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": ["const", "method", "property"] }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "elseif": true, "encoding": true, "explicit_indirect_variable": true, "explicit_string_variable": true, "function_to_constant": true, "implode_call": true, "increment_style": {"style": "pre"}, "is_null": {"use_yoda_style": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "lowercase_constants": true, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": true, "new_with_braces": true, "no_alias_functions": true, "no_closing_tag": true, "no_empty_comment": true, "no_empty_phpdoc": true, "no_empty_statement": true, "no_homoglyph_names": true, "no_mixed_echo_print": {"use": "echo"}, "no_php4_constructor": true, "no_singleline_whitespace_before_semicolons": true, "no_spaces_inside_parenthesis": true, "no_trailing_whitespace": true, "no_unneeded_final_method": true, "no_unused_imports": true, "no_useless_return": true, "no_whitespace_before_comma_in_array": true, "no_whitespace_in_blank_line": true, "non_printable_character": true, "normalize_index_brace": true, "ordered_imports": {"sort_algorithm": "alpha"}, "ordered_interfaces": {"order": "alpha"}, "php_unit_construct": true, "php_unit_internal_class": true, "php_unit_ordered_covers": true, "php_unit_set_up_tear_down_visibility": true, "phpdoc_indent": true, "phpdoc_align": {"align": "vertical"}, "phpdoc_annotation_without_dot": true, "phpdoc_scalar": true, "phpdoc_return_self_reference": {"this": "self"}, "phpdoc_trim": true, "phpdoc_trim_consecutive_blank_line_separation": true, "random_api_migration": true, "self_accessor": true, "return_type_declaration": {"space_before": "one"}, "semicolon_after_instruction": true, "set_type_to_cast": true, "short_scalar_cast": true, "single_blank_line_at_eof": true, "single_line_after_imports": true, "standardize_increment": true, "trailing_comma_in_multiline_array": true, "trim_array_spaces": true, "visibility_required": true, "void_return": true}'' --allow-risky=yes'
+        run: 'vendor/bin/php-cs-fixer fix ./ --rules=''{"array_syntax": {"syntax": "short"}, "blank_line_after_namespace": true, "binary_operator_spaces": {"operators": {"=": "align", ".=": "align", "+=": "align", "-=": "align", "*=": "align", "/=": "align", "|=": "align", "&=": "align", "=>": "align", "??=": "align"}}, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": ["const", "method", "property"] }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "elseif": true, "encoding": true, "explicit_indirect_variable": true, "explicit_string_variable": true, "function_to_constant": true, "implode_call": true, "increment_style": {"style": "pre"}, "is_null": {"use_yoda_style": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "lowercase_constants": true, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": true, "new_with_braces": true, "no_alias_functions": true, "no_closing_tag": true, "no_empty_comment": true, "no_empty_phpdoc": true, "no_empty_statement": true, "no_homoglyph_names": true, "no_mixed_echo_print": {"use": "echo"}, "no_php4_constructor": true, "no_singleline_whitespace_before_semicolons": true, "no_spaces_inside_parenthesis": true, "no_trailing_whitespace": true, "no_unneeded_final_method": true, "no_unused_imports": true, "no_useless_return": true, "no_whitespace_before_comma_in_array": true, "no_whitespace_in_blank_line": true, "non_printable_character": true, "normalize_index_brace": true, "ordered_imports": {"sort_algorithm": "alpha"}, "ordered_interfaces": {"order": "alpha"}, "php_unit_construct": true, "php_unit_internal_class": true, "php_unit_ordered_covers": true, "php_unit_set_up_tear_down_visibility": true, "phpdoc_indent": true, "phpdoc_align": {"align": "vertical"}, "phpdoc_annotation_without_dot": true, "phpdoc_scalar": true, "phpdoc_return_self_reference": {"this": "self"}, "phpdoc_trim": true, "phpdoc_trim_consecutive_blank_line_separation": true, "random_api_migration": true, "self_accessor": true, "return_type_declaration": {"space_before": "one"}, "semicolon_after_instruction": true, "set_type_to_cast": true, "short_scalar_cast": true, "single_blank_line_at_eof": true, "single_line_after_imports": true, "standardize_increment": true, "trailing_comma_in_multiline_array": true, "trim_array_spaces": true, "visibility_required": true, "void_return": true}'' --allow-risky=yes'
       - name: Check for modified files
         id: git-check
         run: echo ::set-output name=modified::$(if git diff-index --quiet HEAD --; then echo "false"; else echo "true"; fi)
diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index 13fa048..d82f117 100755
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -8,210 +8,210 @@ use phpOMS\Router\RouteVerb;
 return [
     '^.*/riskmanagement/cockpit.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskCockpit',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskCockpit',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::COCKPIT,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::COCKPIT,
             ],
         ],
     ],
     '^.*/riskmanagement/risk/list.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskList',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskList',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::RISK,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::RISK,
             ],
         ],
     ],
     '^.*/riskmanagement/risk/create.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskCreate',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskCreate',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::CREATE,
-                'state' => PermissionState::RISK,
+                'type'   => PermissionType::CREATE,
+                'state'  => PermissionState::RISK,
             ],
         ],
     ],
     '^.*/riskmanagement/risk/single.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskSingle',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskSingle',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::RISK,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::RISK,
             ],
         ],
     ],
     '^.*/riskmanagement/cause/list.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskCauseList',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskCauseList',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::CAUSE,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::CAUSE,
             ],
         ],
     ],
     '^.*/riskmanagement/cause/single.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskCauseSingle',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskCauseSingle',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::CAUSE,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::CAUSE,
             ],
         ],
     ],
     '^.*/riskmanagement/solution/list.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskSolutionList',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskSolutionList',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::SOLUTION,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::SOLUTION,
             ],
         ],
     ],
     '^.*/riskmanagement/solution/single.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskSolutionSingle',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskSolutionSingle',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::SOLUTION,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::SOLUTION,
             ],
         ],
     ],
     '^.*/riskmanagement/unit/list.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskUnitList',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskUnitList',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::UNIT,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::UNIT,
             ],
         ],
     ],
     '^.*/riskmanagement/unit/single.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskUnitSingle',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskUnitSingle',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::UNIT,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::UNIT,
             ],
         ],
     ],
     '^.*/riskmanagement/department/list.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskDepartmentList',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskDepartmentList',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::DEPARTMENT,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::DEPARTMENT,
             ],
         ],
     ],
     '^.*/riskmanagement/department/single.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskDepartmentSingle',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskDepartmentSingle',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::DEPARTMENT,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::DEPARTMENT,
             ],
         ],
     ],
     '^.*/riskmanagement/category/list.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskCategoryList',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskCategoryList',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::CATEGORY,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::CATEGORY,
             ],
         ],
     ],
     '^.*/riskmanagement/category/single.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskCategorySingle',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskCategorySingle',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::CATEGORY,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::CATEGORY,
             ],
         ],
     ],
     '^.*/riskmanagement/project/list.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskProjectList',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskProjectList',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::PROJECT,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::PROJECT,
             ],
         ],
     ],
     '^.*/riskmanagement/project/single.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskProjectSingle',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskProjectSingle',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::PROJECT,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::PROJECT,
             ],
         ],
     ],
     '^.*/riskmanagement/process/list.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskProcessList',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskProcessList',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::PROCESS,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::PROCESS,
             ],
         ],
     ],
     '^.*/riskmanagement/process/single.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskProcessSingle',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskProcessSingle',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::PROCESS,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::PROCESS,
             ],
         ],
     ],
     '^.*/riskmanagement/settings/dashboard.*$' => [
         [
-            'dest' => '\Modules\RiskManagement\Controller\BackendController:viewRiskSettings',
-            'verb' => RouteVerb::GET,
+            'dest'       => '\Modules\RiskManagement\Controller\BackendController:viewRiskSettings',
+            'verb'       => RouteVerb::GET,
             'permission' => [
                 'module' => BackendController::MODULE_NAME,
-                'type'  => PermissionType::READ,
-                'state' => PermissionState::SETTINGS,
+                'type'   => PermissionType::READ,
+                'state'  => PermissionState::SETTINGS,
             ],
         ],
     ],
diff --git a/Models/RiskMapper.php b/Models/RiskMapper.php
index 2ee6739..4806a8d 100755
--- a/Models/RiskMapper.php
+++ b/Models/RiskMapper.php
@@ -57,28 +57,28 @@ final class RiskMapper extends DataMapperAbstract
      */
     protected static array $hasMany = [
         'media'       => [
-            'mapper' => MediaMapper::class,
-            'table'  => 'riskmngmt_risk_media',
+            'mapper'   => MediaMapper::class,
+            'table'    => 'riskmngmt_risk_media',
             'external' => 'riskmngmt_risk_media_risk',
-            'self'   => 'riskmngmt_risk_media_media',
+            'self'     => 'riskmngmt_risk_media_media',
         ],
         'riskObjects' => [
-            'mapper' => RiskObjectMapper::class,
-            'table'  => 'riskmngmt_risk_object',
+            'mapper'   => RiskObjectMapper::class,
+            'table'    => 'riskmngmt_risk_object',
             'external' => 'riskmngmt_risk_object_risk',
-            'self'   => null,
+            'self'     => null,
         ],
         'causes'      => [
-            'mapper' => CauseMapper::class,
-            'table'  => 'riskmngmt_cause',
+            'mapper'   => CauseMapper::class,
+            'table'    => 'riskmngmt_cause',
             'external' => 'riskmngmt_cause_risk',
-            'self'   => null,
+            'self'     => null,
         ],
         'solutions'   => [
-            'mapper' => SolutionMapper::class,
-            'table'  => 'riskmngmt_solution',
+            'mapper'   => SolutionMapper::class,
+            'table'    => 'riskmngmt_solution',
             'external' => 'riskmngmt_solution_risk',
-            'self'   => null,
+            'self'     => null,
         ],
     ];
 
diff --git a/Theme/Backend/category-list.tpl.php b/Theme/Backend/category-list.tpl.php
index 7f82c7d..6080411 100755
--- a/Theme/Backend/category-list.tpl.php
+++ b/Theme/Backend/category-list.tpl.php
@@ -28,7 +28,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td colspan="3">
                         <tbody>
                         <?php $c = 0; foreach ($categories as $key => $value) : ++$c;
-                        $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/category/single?{?}&id=' . $value->getId()); ?>
+                        $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/category/single?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
diff --git a/Theme/Backend/cause-list.tpl.php b/Theme/Backend/cause-list.tpl.php
index 2f0a3d5..9d731fe 100755
--- a/Theme/Backend/cause-list.tpl.php
+++ b/Theme/Backend/cause-list.tpl.php
@@ -29,7 +29,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td colspan="3">
                         <tbody>
                         <?php $c = 0; foreach ($causes as $key => $value) : ++$c;
-                        $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
+                        $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
diff --git a/Theme/Backend/cockpit.tpl.php b/Theme/Backend/cockpit.tpl.php
index 4f845f8..18d4a29 100755
--- a/Theme/Backend/cockpit.tpl.php
+++ b/Theme/Backend/cockpit.tpl.php
@@ -43,7 +43,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td colspan="6">
                 <tbody>
                 <?php $c = 0; foreach ([] as $key => $value) : ++$c;
-                $url = \phpOMS\Uri\UriFactory::build('{/prefix}admin/group/settings?{?}&id=' . $value->getId()); ?>
+                $url     = \phpOMS\Uri\UriFactory::build('{/prefix}admin/group/settings?{?}&id=' . $value->getId()); ?>
                 <tr>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
diff --git a/Theme/Backend/department-list.tpl.php b/Theme/Backend/department-list.tpl.php
index 376cf30..35a09be 100755
--- a/Theme/Backend/department-list.tpl.php
+++ b/Theme/Backend/department-list.tpl.php
@@ -28,7 +28,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td colspan="3">
                         <tbody>
                         <?php $c = 0; foreach ($departments as $key => $value) : ++$c;
-                        $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/department/single?{?}&id=' . $value->getId()); ?>
+                        $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/department/single?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getDepartment()->getName()); ?></a>
diff --git a/Theme/Backend/department-single.tpl.php b/Theme/Backend/department-single.tpl.php
index cd7356d..ad65215 100755
--- a/Theme/Backend/department-single.tpl.php
+++ b/Theme/Backend/department-single.tpl.php
@@ -112,7 +112,7 @@ echo $this->getData('nav')->render(); ?>
                             <tr><td colspan="5">
                                     <tbody>
                                     <?php $c = 0; foreach ($risks as $key => $value) : ++$c;
-                                    $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
+                                    $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
@@ -143,7 +143,7 @@ echo $this->getData('nav')->render(); ?>
                             <tr><td colspan="3">
                                     <tbody>
                                     <?php $c = 0; foreach ($categories as $key => $value) : ++$c;
-                                    $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/category/single?{?}&id=' . $value->getId()); ?>
+                                    $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/category/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
@@ -171,7 +171,7 @@ echo $this->getData('nav')->render(); ?>
                             <tr><td colspan="3">
                                     <tbody>
                                     <?php $c = 0; foreach ($projects as $key => $value) : ++$c;
-                                    $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/project/single?{?}&id=' . $value->getId()); ?>
+                                    $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/project/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getProject()->getName()); ?></a>
@@ -199,7 +199,7 @@ echo $this->getData('nav')->render(); ?>
                             <tr><td colspan="3">
                                     <tbody>
                                     <?php $c = 0; foreach ($processes as $key => $value) : ++$c;
-                                    $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/process/single?{?}&id=' . $value->getId()); ?>
+                                    $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/process/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
@@ -228,7 +228,7 @@ echo $this->getData('nav')->render(); ?>
                             <tr><td colspan="3">
                                     <tbody>
                                     <?php $c = 0; foreach ($causes as $key => $value) : ++$c;
-                                    $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
+                                    $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
@@ -259,7 +259,7 @@ echo $this->getData('nav')->render(); ?>
                             <tr><td colspan="4">
                                     <tbody>
                                     <?php $c = 0; foreach ($solutions as $key => $value) : ++$c;
-                                    $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/solution/single?{?}&id=' . $value->getId()); ?>
+                                    $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/solution/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
diff --git a/Theme/Backend/process-list.tpl.php b/Theme/Backend/process-list.tpl.php
index 8c814f3..5a43490 100755
--- a/Theme/Backend/process-list.tpl.php
+++ b/Theme/Backend/process-list.tpl.php
@@ -28,7 +28,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td colspan="3">
                         <tbody>
                         <?php $c = 0; foreach ($processes as $key => $value) : ++$c;
-                        $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/process/single?{?}&id=' . $value->getId()); ?>
+                        $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/process/single?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
diff --git a/Theme/Backend/project-list.tpl.php b/Theme/Backend/project-list.tpl.php
index c9e7d83..49cabe4 100755
--- a/Theme/Backend/project-list.tpl.php
+++ b/Theme/Backend/project-list.tpl.php
@@ -28,7 +28,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td colspan="3">
                         <tbody>
                         <?php $c = 0; foreach ($projects as $key => $value) : ++$c;
-                        $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/project/single?{?}&id=' . $value->getId()); ?>
+                        $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/project/single?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getProject()->getName()); ?></a>
diff --git a/Theme/Backend/risk-list.tpl.php b/Theme/Backend/risk-list.tpl.php
index 533718b..f5e1343 100755
--- a/Theme/Backend/risk-list.tpl.php
+++ b/Theme/Backend/risk-list.tpl.php
@@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td colspan="5">
                         <tbody>
                         <?php $c = 0; foreach ($risks as $key => $value) : ++$c;
-                        $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/risk/single?{?}&id=' . $value->getId()); ?>
+                        $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/risk/single?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
diff --git a/Theme/Backend/solution-list.tpl.php b/Theme/Backend/solution-list.tpl.php
index 20cc11e..b775ba7 100755
--- a/Theme/Backend/solution-list.tpl.php
+++ b/Theme/Backend/solution-list.tpl.php
@@ -31,7 +31,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td colspan="4">
                         <tbody>
                         <?php $c = 0; foreach ($solutions as $key => $value) : ++$c;
-                        $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/solution/single?{?}&id=' . $value->getId()); ?>
+                        $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/solution/single?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
diff --git a/Theme/Backend/unit-list.tpl.php b/Theme/Backend/unit-list.tpl.php
index fac4d1b..ee84b2d 100755
--- a/Theme/Backend/unit-list.tpl.php
+++ b/Theme/Backend/unit-list.tpl.php
@@ -28,7 +28,7 @@ echo $this->getData('nav')->render(); ?>
                 <tr><td colspan="3">
                         <tbody>
                         <?php $c = 0; foreach ($units as $key => $value) : ++$c;
-                        $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/unit/single?{?}&id=' . $value->getId()); ?>
+                        $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/unit/single?{?}&id=' . $value->getId()); ?>
                 <tr tabindex="0" data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                     <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
diff --git a/Theme/Backend/unit-single.tpl.php b/Theme/Backend/unit-single.tpl.php
index 296d8f4..928d629 100755
--- a/Theme/Backend/unit-single.tpl.php
+++ b/Theme/Backend/unit-single.tpl.php
@@ -113,7 +113,7 @@ echo $this->getData('nav')->render(); ?>
                             <tr><td colspan="5">
                                     <tbody>
                                     <?php $c = 0; foreach ($risks as $key => $value) : ++$c;
-                                    $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
+                                    $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
@@ -144,7 +144,7 @@ echo $this->getData('nav')->render(); ?>
                             <tr><td colspan="3">
                                     <tbody>
                                     <?php $c = 0; foreach ($departments as $key => $value) : ++$c;
-                                    $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/department/single?{?}&id=' . $value->getId()); ?>
+                                    $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/department/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getDepartment()->getName()); ?></a>
@@ -172,7 +172,7 @@ echo $this->getData('nav')->render(); ?>
                             <tr><td colspan="3">
                                     <tbody>
                                     <?php $c = 0; foreach ($categories as $key => $value) : ++$c;
-                                    $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/category/single?{?}&id=' . $value->getId()); ?>
+                                    $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/category/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
@@ -200,7 +200,7 @@ echo $this->getData('nav')->render(); ?>
                             <tr><td colspan="3">
                                     <tbody>
                                     <?php $c = 0; foreach ($projects as $key => $value) : ++$c;
-                                    $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/project/single?{?}&id=' . $value->getId()); ?>
+                                    $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/project/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getProject()->getName()); ?></a>
@@ -228,7 +228,7 @@ echo $this->getData('nav')->render(); ?>
                             <tr><td colspan="3">
                                     <tbody>
                                     <?php $c = 0; foreach ($processes as $key => $value) : ++$c;
-                                    $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/process/single?{?}&id=' . $value->getId()); ?>
+                                    $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/process/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
@@ -257,7 +257,7 @@ echo $this->getData('nav')->render(); ?>
                             <tr><td colspan="3">
                                     <tbody>
                                     <?php $c = 0; foreach ($causes as $key => $value) : ++$c;
-                                    $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
+                                    $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/cause/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>
@@ -288,7 +288,7 @@ echo $this->getData('nav')->render(); ?>
                             <tr><td colspan="4">
                                     <tbody>
                                     <?php $c = 0; foreach ($solutions as $key => $value) : ++$c;
-                                    $url = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/solution/single?{?}&id=' . $value->getId()); ?>
+                                    $url     = \phpOMS\Uri\UriFactory::build('{/prefix}riskmanagement/solution/single?{?}&id=' . $value->getId()); ?>
                             <tr data-href="<?= $url; ?>">
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getId()); ?></a>
                                 <td><a href="<?= $url; ?>"><?= $this->printHtml($value->getTitle()); ?></a>