diff --git a/application/modules/admin/controllers/admin/Index.php b/application/modules/admin/controllers/admin/Index.php
index 293f9af8c..4199170bb 100644
--- a/application/modules/admin/controllers/admin/Index.php
+++ b/application/modules/admin/controllers/admin/Index.php
@@ -94,7 +94,7 @@ public function indexAction()
         $this->getView()->set('ilchNewsList', $this->getConfig()->get('updateserver') . 'ilchNews.php');
         $this->getView()->set('version', $this->getConfig()->get('version'));
         $this->getView()->set('notifications', $notificationsMapper->getNotifications());
-        $this->getLayout()->set('accesses', $this->getAccesses());
+        $this->getView()->set('accesses', $this->getAccesses());
     }
 
     public function deleteAction()
diff --git a/application/modules/admin/views/admin/index/index.php b/application/modules/admin/views/admin/index/index.php
index 44440779b..dfbdaa4b5 100644
--- a/application/modules/admin/views/admin/index/index.php
+++ b/application/modules/admin/views/admin/index/index.php
@@ -125,7 +125,7 @@
                     </thead>
                     <tbody>
                         <?php foreach ($notifications as $notification) : ?>
-                            <?php if (($accesses && $accesses->hasAccess('Admin_' . $notification->getModule(), $notification->getModule()))) : ?>
+                            <?php if (($accesses && $accesses->hasAccess('Admin_' . $notification->getModule(), 'Admin_' . $notification->getModule()))) : ?>
                                 <?php $date = new \Ilch\Date($notification->getTimestamp()); ?>
                             <tr>
                                 <td><?=$this->getDeleteCheckbox('check_notifications', $notification->getId()) ?></td>
diff --git a/application/modules/bbcodeconvert/config/config.php b/application/modules/bbcodeconvert/config/config.php
index 035f285cf..feb4d7b8a 100644
--- a/application/modules/bbcodeconvert/config/config.php
+++ b/application/modules/bbcodeconvert/config/config.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Ilch 2
  * @package ilch
diff --git a/application/modules/bbcodeconvert/controllers/admin/Index.php b/application/modules/bbcodeconvert/controllers/admin/Index.php
index 5e244cce1..29c04a385 100644
--- a/application/modules/bbcodeconvert/controllers/admin/Index.php
+++ b/application/modules/bbcodeconvert/controllers/admin/Index.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Ilch 2
  * @package ilch
@@ -99,7 +100,7 @@ public function indexAction()
             }
         }
 
-        foreach (glob(APPLICATION_PATH.'/layouts/*') as $layoutPath) {
+        foreach (glob(APPLICATION_PATH . '/layouts/*') as $layoutPath) {
             if (is_dir($layoutPath)) {
                 $configClass = '\\Layouts\\' . ucfirst(basename($layoutPath)) . '\\Config\\Config';
                 $config = new $configClass($this->getTranslator());
@@ -165,7 +166,7 @@ public function convertAction()
         }
 
         $converted = [];
-        foreach($_SESSION['bbcodeconvert_toConvert'] as $value) {
+        foreach ($_SESSION['bbcodeconvert_toConvert'] as $value) {
             $converted[$value['key']] = $value['completed'];
         }
 
@@ -270,7 +271,7 @@ public function convert(string $key, int $index, int $progress, string $currentT
                 $textsMapper->table = 'events';
                 $texts = $textsMapper->getTexts($index, self::batch);
 
-                foreach($texts as $text) {
+                foreach ($texts as $text) {
                     $convertedText = $this->getView()->getHtmlFromBBCode($text['text']);
 
                     if (strlen($convertedText) <= self::limitLongText) {
@@ -289,7 +290,7 @@ public function convert(string $key, int $index, int $progress, string $currentT
                 $textsMapper->table = 'forum_posts';
                 $texts = $textsMapper->getTexts($index, self::batch);
 
-                foreach($texts as $text) {
+                foreach ($texts as $text) {
                     $convertedText = $this->getView()->getHtmlFromBBCode($text['text']);
 
                     if (strlen($convertedText) <= self::limitText) {
@@ -308,7 +309,7 @@ public function convert(string $key, int $index, int $progress, string $currentT
                 $textsMapper->table = 'gbook';
                 $texts = $textsMapper->getTexts($index, self::batch);
 
-                foreach($texts as $text) {
+                foreach ($texts as $text) {
                     $convertedText = $this->getView()->getHtmlFromBBCode($text['text']);
 
                     if (strlen($convertedText) <= self::limitMediumText) {
@@ -327,7 +328,7 @@ public function convert(string $key, int $index, int $progress, string $currentT
                 $textsMapper->table = 'jobs';
                 $texts = $textsMapper->getTexts($index, self::batch);
 
-                foreach($texts as $text) {
+                foreach ($texts as $text) {
                     $convertedText = $this->getView()->getHtmlFromBBCode($text['text']);
 
                     if (strlen($convertedText) <= self::limitMediumText) {
@@ -346,7 +347,7 @@ public function convert(string $key, int $index, int $progress, string $currentT
                 $textsMapper->table = 'kvticket';
                 $texts = $textsMapper->getTexts($index, self::batch);
 
-                foreach($texts as $text) {
+                foreach ($texts as $text) {
                     $convertedText = $this->getView()->getHtmlFromBBCode($text['text']);
 
                     if (strlen($convertedText) <= self::limitMediumText) {
@@ -361,7 +362,7 @@ public function convert(string $key, int $index, int $progress, string $currentT
                 return ['completed' => false, 'index' => $index + count($texts), 'progress' => $index + count($texts)];
             case 'radiohoerercharts':
                 // table: config, column: value, datatype: TEXT
-                foreach(['radio_hoerercharts_votetext_de', 'radio_hoerercharts_votetext_en'] as $voteTextKey) {
+                foreach (['radio_hoerercharts_votetext_de', 'radio_hoerercharts_votetext_en'] as $voteTextKey) {
                     $convertedText = $this->getView()->getHtmlFromBBCode($this->getConfig()->get($voteTextKey));
 
                     if (strlen($convertedText) <= self::limitText) {
@@ -376,7 +377,7 @@ public function convert(string $key, int $index, int $progress, string $currentT
                 $textsMapper->table = 'teams_joins';
                 $texts = $textsMapper->getTexts($index, self::batch);
 
-                foreach($texts as $text) {
+                foreach ($texts as $text) {
                     $convertedText = $this->getView()->getHtmlFromBBCode($text['text']);
 
                     if (strlen($convertedText) <= self::limitLongText) {
@@ -396,7 +397,7 @@ public function convert(string $key, int $index, int $progress, string $currentT
                     // table: users, column: signature, datatype: VARCHAR(255)
                     $signatures = $userMapper->getSignatures($index, self::batch);
 
-                    foreach($signatures as $signature) {
+                    foreach ($signatures as $signature) {
                         $convertedSignature = $this->getView()->getHtmlFromBBCode($signature['signature']);
 
                         if (strlen($convertedSignature) <= 255) {
@@ -417,7 +418,7 @@ public function convert(string $key, int $index, int $progress, string $currentT
                 // table: users_dialog_reply, column: reply, datatype: TEXT
                 $replies = $userMapper->getReplies($index, self::batch);
 
-                foreach($replies as $reply) {
+                foreach ($replies as $reply) {
                     $convertedReply = $this->getView()->getHtmlFromBBCode($reply['reply']);
 
                     if (strlen($convertedReply) <= self::limitText) {
diff --git a/application/modules/bbcodeconvert/mappers/Texts.php b/application/modules/bbcodeconvert/mappers/Texts.php
index 697e75d9e..3d4d98aca 100644
--- a/application/modules/bbcodeconvert/mappers/Texts.php
+++ b/application/modules/bbcodeconvert/mappers/Texts.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Ilch 2
  * @package ilch
diff --git a/application/modules/bbcodeconvert/mappers/User.php b/application/modules/bbcodeconvert/mappers/User.php
index c9701453e..a876cf47f 100644
--- a/application/modules/bbcodeconvert/mappers/User.php
+++ b/application/modules/bbcodeconvert/mappers/User.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Ilch 2
  * @package ilch
diff --git a/application/modules/bbcodeconvert/translations/de.php b/application/modules/bbcodeconvert/translations/de.php
index 047435b3a..1a95a087a 100644
--- a/application/modules/bbcodeconvert/translations/de.php
+++ b/application/modules/bbcodeconvert/translations/de.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Ilch 2
  * @package ilch
diff --git a/application/modules/bbcodeconvert/translations/en.php b/application/modules/bbcodeconvert/translations/en.php
index bbe10ff33..5e7e08883 100644
--- a/application/modules/bbcodeconvert/translations/en.php
+++ b/application/modules/bbcodeconvert/translations/en.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Ilch 2
  * @package ilch
diff --git a/application/modules/bbcodeconvert/views/admin/index/convert.php b/application/modules/bbcodeconvert/views/admin/index/convert.php
index 1dda3d55c..7a1de0797 100644
--- a/application/modules/bbcodeconvert/views/admin/index/convert.php
+++ b/application/modules/bbcodeconvert/views/admin/index/convert.php
@@ -1,3 +1,7 @@
+<?php
+
+/** @var \Ilch\View $this */
+?>
 <h1><?=$this->getTrans('menuConvert') ?></h1>
 
 <div class="table-responsive">
@@ -18,7 +22,7 @@
                 <td><?=$this->getTrans($moduleOrLayout['key']) ?></td>
                 <td>
                     <div class="progress">
-                        <div class="progress-bar" role="progressbar" style="width: <?=(!$moduleOrLayout['completed'] && $moduleOrLayout['count']) ? ($moduleOrLayout['progress']/$moduleOrLayout['count']) * 100 : 100 ?>%" aria-valuenow="<?=$moduleOrLayout['progress'] ?>" aria-valuemin="0" aria-valuemax="<?=$moduleOrLayout['count'] ?>"></div>
+                        <div class="progress-bar" role="progressbar" style="width: <?=(!$moduleOrLayout['completed'] && $moduleOrLayout['count']) ? ($moduleOrLayout['progress'] / $moduleOrLayout['count']) * 100 : 100 ?>%" aria-valuenow="<?=$moduleOrLayout['progress'] ?>" aria-valuemin="0" aria-valuemax="<?=$moduleOrLayout['count'] ?>"></div>
                     </div>
                 </td>
             </tr>
diff --git a/application/modules/bbcodeconvert/views/admin/index/index.php b/application/modules/bbcodeconvert/views/admin/index/index.php
index 0ea91cc4d..d73752edf 100644
--- a/application/modules/bbcodeconvert/views/admin/index/index.php
+++ b/application/modules/bbcodeconvert/views/admin/index/index.php
@@ -1,3 +1,7 @@
+<?php
+
+/** @var \Ilch\View $this */
+?>
 <link href="<?=$this->getModuleUrl('static/css/bbcodeconvert_styles.css') ?>" rel="stylesheet">
 
 <h1><?=$this->getTrans('menuOverview') ?>
@@ -50,7 +54,9 @@
             </tr>
             </thead>
             <tbody>
-            <?php foreach ($this->get('installedSupportedModules') as $module) : ?>
+            <?php
+            /** @var \Modules\Admin\Models\Module $module */
+            foreach ($this->get('installedSupportedModules') as $module) : ?>
                 <tr class="filter">
                     <td><?=$this->getDeleteCheckbox('check_modules', $module->getKey()) ?></td>
                     <td><?=$this->getTrans($module->getKey()) ?></td>
@@ -83,7 +89,9 @@
             </tr>
             </thead>
             <tbody>
-            <?php foreach ($this->get('installedSupportedLayouts') as $layout) : ?>
+            <?php
+            /** @var \Modules\Admin\Models\Layout $layout */
+            foreach ($this->get('installedSupportedLayouts') as $layout) : ?>
                 <tr class="filter">
                     <td><?=$this->getDeleteCheckbox('check_layouts', $layout->getKey()) ?></td>
                     <td><?=$this->getTrans($layout->getKey()) ?></td>
diff --git a/application/modules/bbcodeconvert/views/admin/index/note.php b/application/modules/bbcodeconvert/views/admin/index/note.php
index 89ed93236..218d1783a 100644
--- a/application/modules/bbcodeconvert/views/admin/index/note.php
+++ b/application/modules/bbcodeconvert/views/admin/index/note.php
@@ -1,3 +1,7 @@
+<?php
+
+/** @var \Ilch\View $this */
+?>
 <link href="<?=$this->getModuleUrl('static/css/bbcodeconvert_styles.css') ?>" rel="stylesheet">
 
 <h1><?=$this->getTrans('menuNote') ?>
diff --git a/index.php b/index.php
index 618e9827d..65146924c 100644
--- a/index.php
+++ b/index.php
@@ -31,7 +31,7 @@
 $serverTimeZone = @date_default_timezone_get();
 date_default_timezone_set('UTC');
 
-define('VERSION', '2.1.57');
+define('VERSION', '2.1.58');
 define('SERVER_TIMEZONE', $serverTimeZone);
 define('DEFAULT_MODULE', 'page');
 define('DEFAULT_LAYOUT', 'index');