diff --git a/app/views/course/plus/index.php b/app/views/course/plus/index.php
index 9cb224a2b5a372c12db0e6d08034c10aa76c448f..9daa3dee63850d2a85cb9388ea8273fcd0c41689 100644
--- a/app/views/course/plus/index.php
+++ b/app/views/course/plus/index.php
@@ -1,4 +1,4 @@
-<?php
+<?
 
 /*
  *  Copyright (c) 2012  Rasmus Fuhse <fuhse@data-quest.de>
@@ -8,261 +8,238 @@
  *  published by the Free Software Foundation; either version 2 of
  *  the License, or (at your option) any later version.
  */
-use Studip\Button, Studip\LinkButton;
+
+use Studip\Button;
 
 ?>
 
 <form action="<?= URLHelper::getLink($save_url) ?>" method="post" class="default">
-<?= CSRFProtection::tokenTag() ?>
-<input name="uebernehmen" value="1" type="hidden">
-<table class="default nohover plus">
-<!-- <caption><?=_("Inhaltselemente")?></caption> -->
-<tbody>
-<?
-foreach ($available_modules as $category => $pluginlist) {
-    $visibility = "";
-    if ($_SESSION['plus']['displaystyle'] != 'category' && $category != 'Funktionen von A-Z') {
-        $visibility = "invisible";
-    }
-    if (isset($_SESSION['plus']) && !$_SESSION['plus']['Kategorie'][$category] && $category != 'Funktionen von A-Z') {
-        $visibility = "invisible";
-    }
-
-    ?>
-    <tr class="<?= $visibility; ?>">
-        <th colspan=3>
-            <?= htmlReady($category) ?>
-        </th>
-    </tr>
-
-    <? foreach ($pluginlist as $key => $val) {
-
-        if ($val['type'] == 'plugin') {
-            $plugin = $val['object'];
-            $plugin_activated = $plugin->isActivated();
-            $info = $plugin->getMetadata();
-
-            //Checkbox
-            $anchor = 'p_' . $plugin->getPluginId();
-            $cb_name = 'plugin_' . $plugin->getPluginId();
-            $cb_disabled = '';
-            $cb_checked = $plugin_activated ? "checked" : "";
-
-            $pluginname = $val['displayname'];
-            $URL = $plugin->isCorePlugin() ? $GLOBALS['ABSOLUTE_URI_STUDIP'] : $plugin->getPluginURL();
-            $pluginvisibility = $val['visibility'];
-        }
-        ?>
-
-        <tr id="<?= htmlReady($anchor);?>" class="<?= $visibility; ?> <?= $pre_check != null ? ' quiet' : '' ?>">
-            <td class="element" colspan=3>
-
-                <div class="plus_basic">
-
-                    <!-- checkbox -->
-                    <input type="checkbox"
-                           id="<?= $pluginname ?>"
-                           name="<?= $cb_name ?>"
-                           data-moduleclass="<?= htmlReady($val['moduleclass']) ?>"
-                           data-key="<?= htmlReady($val['modulkey']) ?>"
-                           value="TRUE" <?= $cb_disabled ?> <?= $cb_checked ?>
-                           onClick="STUDIP.Plus.setModule.call(this);">
-
-                    <div class="element_header">
-
-                        <!-- Name -->
-                        <label for="<?= $pluginname ?>">
-                            <strong><?= htmlReady($pluginname) ?></strong>
-                            <? if ($cb_checked) : ?>
-                                <?=Icon::create(
-                                    $pluginvisibility === 'autor' ? 'visibility-visible' : 'visibility-invisible',
-                                    Icon::ROLE_INFO,
-                                    ['title' => sprintf(_('%s für Studierende'), $pluginvisibility === 'autor' ? _('Sichtbar') : _('Unsichtbar'))]
-                                )?>
-                            <? endif ?>
-                        </label>
-
-                    </div>
-
-                    <div class="element_description">
-
-                        <!-- icon -->
-                        <? if (isset($info['icon'])) : ?>
-                            <? /* TODO: Plugins should use class "Icon"  */ ?>
-                            <? if (is_string($info['icon'])) : ?>
-                                <img class="plugin_icon text-bottom" alt="" src="<?= $URL . "/" . $info['icon'] ?> ">
-                            <? else: ?>
-                                <?= $info['icon']->asImg(['class' => 'plugin_icon text-bottom', 'alt' => '']) ?>
-                            <? endif ?>
-                        <? endif ?>
-
-                        <!-- shortdesc -->
-                        <strong class="shortdesc">
-                            <? if (isset($info['descriptionshort'])) : ?>
-                                <? foreach (explode('\n', $info['descriptionshort']) as $descriptionshort) { ?>
-                                    <?= htmlReady($descriptionshort) ?>
-                                <? } ?>
-                            <? endif ?>
-                            <? if (!isset($info['descriptionshort'])) : ?>
-                                <? if (isset($info['summary'])) : ?>
-                                    <?= htmlReady($info['summary']) ?>
-                                <? elseif (isset($info['description'])) : ?>
-                                    <?= htmlReady($info['description']) ?>
-                                <? else: ?>
-                                    <?= _("Keine Beschreibung vorhanden.") ?>
-                                <? endif ?>
-                            <? endif ?>
-                        </strong>
-                    </div>
-
-
-                    <? if ($plugin_activated) : ?>
-                        <?php
-                            $actionMenu = ActionMenu::get();
-
-                            $actionMenu->addLink(
-                                $controller->url_for('/edittool/' . $key),
-                                _('Optionen bearbeiten'),
-                                Icon::create('edit', Icon::ROLE_CLICKABLE, ['size' => 20]),
-                                ['data-dialog' => 'size=auto']
-                            );
-                        if (method_exists($plugin, 'deleteContent')) {
-                            $actionMenu->addLink(
-                                $controller->url_for('/index', ['deleteContent' => 1, 'name' => $key]),
-                                _('Inhalte löschen'),
-                                Icon::create('trash', Icon::ROLE_CLICKABLE, ['size' => 20])
-                            );
-                        }
-                        ?>
-                        <div style="float: right">
-                        <?= $actionMenu->render() ?>
-                        </div>
-                    <? endif ?>
-                </div>
-
-                <? if ($_SESSION['plus']['View'] == 'openall' || !isset($_SESSION['plus'])) { ?>
-
-                    <div class="plus_expert hidden-tiny-down">
-
-                        <div class="screenshot_holder">
-                            <? if (isset($info['screenshot']) || isset($info['screenshots'])) :
-                                if(isset($info['screenshots'])){
-                                    $title = $info['screenshots']['pictures'][0]['title'];
-                                    $source = $info['screenshots']['path'].'/'.$info['screenshots']['pictures'][0]['source'];
-                                } else {
-                                    $fileext = end(explode(".", $info['screenshot']));
-                                    $title = str_replace("_"," ",basename($info['screenshot'], ".".$fileext));
-                                    $source = $info['screenshot'];
-                                }
-                                ?>
-
-                                <a href="<?= $URL . "/" . $source ?>"
-                                   data-lightbox="<?= $pluginname ?>" data-title="<?= $title ?>">
-                                    <img class="big_thumb" src="<?= $URL . "/" . $source ?>"
-                                         alt="<?= $pluginname ?>"/>
-                                </a>
-
-                                <?
-                                if (isset($info['additionalscreenshots']) || (isset($info['screenshots']) && count($info['screenshots']) > 1) ) {
+    <?= CSRFProtection::tokenTag() ?>
+    <input name="uebernehmen" value="1" type="hidden">
+    <table class="default nohover plus">
+        <!-- <caption><?= _("Inhaltselemente") ?></caption> -->
+        <tbody>
+            <? foreach ($available_modules as $category => $pluginlist) : ?>
+                <?
+                $visibility = '';
+                if ($_SESSION['plus']['displaystyle'] != 'category' && $category != 'Funktionen von A-Z') {
+                    $visibility = 'invisible';
+                }
+                if (isset($_SESSION['plus']) && !$_SESSION['plus']['Kategorie'][$category] && $category != 'Funktionen von A-Z') {
+                    $visibility = 'invisible';
+                }
+                ?>
+                <tr class="<?= $visibility; ?>">
+                    <th colspan=3>
+                        <?= htmlReady($category) ?>
+                    </th>
+                </tr>
+                <? foreach ($pluginlist as $key => $val) : ?>
+                    <?
+                    if ($val['type'] == 'plugin') {
+                        $plugin           = $val['object'];
+                        $plugin_activated = $plugin->isActivated();
+                        $info             = $plugin->getMetadata();
+
+                        //Checkbox
+                        $anchor      = 'p_' . $plugin->getPluginId();
+                        $cb_disabled = '';
+                        $cb_checked  = $plugin_activated ? "checked" : "";
+
+                        $pluginname       = $val['displayname'];
+                        $url              = $plugin->isCorePlugin() ? $GLOBALS['ABSOLUTE_URI_STUDIP'] : $plugin->getPluginURL();
+                        $pluginvisibility = $val['visibility'];
+                    }
+                    ?>
+
+                    <tr id="<?= htmlReady($anchor); ?>"
+                        class="<?= $visibility; ?> <?= $pre_check != null ? ' quiet' : '' ?>">
+                        <td class="element" colspan=3>
+                            <div class="plus_basic">
+
+                                <input type="checkbox"
+                                       id="<?= $key ?>"
+                                       name="<?= $key ?>"
+                                       data-moduleclass="<?= htmlReady($val['moduleclass']) ?>"
+                                       data-key="<?= htmlReady($val['modulkey']) ?>"
+                                       value="TRUE" <?= $cb_disabled ?> <?= $cb_checked ?>
+                                       onClick="STUDIP.Plus.setModule.call(this);">
+                                <div class="element_header">
+                                    <!-- Name -->
+                                    <label for="<?= $key ?>">
+                                        <strong><?= htmlReady($pluginname) ?></strong>
+                                        <? if ($cb_checked) : ?>
+                                            <?= Icon::create(
+                                                $pluginvisibility === 'autor' ? 'visibility-visible' : 'visibility-invisible',
+                                                Icon::ROLE_INFO,
+                                                [
+                                                    'title' => sprintf(
+                                                        _('%s für Studierende'),
+                                                        $pluginvisibility === 'autor' ? _('Sichtbar') : _('Unsichtbar')
+                                                    )
+                                                ]
+                                            ) ?>
+                                        <? endif ?>
+                                    </label>
+                                </div>
+                                <div class="element_description">
+                                    <? if (isset($info['icon'])) : ?>
+                                        <? /* TODO: Plugins should use class "Icon"  */ ?>
+                                        <? if (is_string($info['icon'])) : ?>
+                                            <img class="plugin_icon text-bottom" alt=""
+                                                 src="<?= htmlReady($url . "/" . $info['icon']) ?> ">
+                                        <? else: ?>
+                                            <?= $info['icon']->asImg(['class' => 'plugin_icon text-bottom', 'alt' => '']) ?>
+                                        <? endif ?>
+                                    <? endif ?>
+                                    <strong class="shortdesc">
+                                        <? if (isset($info['descriptionshort'])) : ?>
+                                            <? foreach (explode('\n', $info['descriptionshort']) as $descriptionshort) : ?>
+                                                <?= htmlReady($descriptionshort) ?>
+                                            <? endforeach ?>
+                                        <? endif ?>
+                                        <? if (!isset($info['descriptionshort'])) : ?>
+                                            <? if (isset($info['summary'])) : ?>
+                                                <?= htmlReady($info['summary']) ?>
+                                            <? elseif (isset($info['description'])) : ?>
+                                                <?= htmlReady($info['description']) ?>
+                                            <? else: ?>
+                                                <?= _('Keine Beschreibung vorhanden.') ?>
+                                            <? endif ?>
+                                        <? endif ?>
+                                    </strong>
+                                </div>
+                                <? if ($plugin_activated) : ?>
+                                    <?
+                                    $actionMenu = ActionMenu::get();
+                                    $actionMenu->addLink(
+                                        $controller->url_for('/edittool/' . $key),
+                                        _('Optionen bearbeiten'),
+                                        Icon::create('edit'),
+                                        ['data-dialog' => 'size=auto']
+                                    );
+                                    if (method_exists($plugin, 'deleteContent')) {
+                                        $actionMenu->addLink(
+                                            $controller->url_for('/index', ['deleteContent' => 1, 'name' => $key]),
+                                            _('Inhalte löschen'),
+                                            Icon::create('trash')
+                                        );
+                                    }
                                     ?>
-
-                                    <div class="thumb_holder">
-                                    <?  if (isset($info['screenshots'])){
-                                            $counter = count($info['screenshots']['pictures']);
-                                            $cstart = 1;
-                                        } else {
-                                            $counter = count($info['additionalscreenshots']);
-                                            $cstart = 0;
-                                        } ?>
-
-                                        <? for ($i = $cstart; $i < $counter; $i++) {
-
-                                            if (isset($info['screenshots'])){
-                                                $title = $info['screenshots']['pictures'][$i]['title'];
-                                                $source = $info['screenshots']['path'].'/'.$info['screenshots']['pictures'][$i]['source'];
+                                    <div style="float: right">
+                                        <?= $actionMenu->render() ?>
+                                    </div>
+                                <? endif ?>
+                            </div>
+
+                            <? if ($_SESSION['plus']['View'] === 'openall' || !isset($_SESSION['plus'])) : ?>
+                                <div class="plus_expert hidden-tiny-down">
+                                    <div class="screenshot_holder">
+                                        <? if (isset($info['screenshot']) || isset($info['screenshots'])) :
+                                            if (isset($info['screenshots'])) {
+                                                $title  = $info['screenshots']['pictures'][0]['title'];
+                                                $source = $info['screenshots']['path'] . '/' . $info['screenshots']['pictures'][0]['source'];
                                             } else {
-                                                $fileext = end(explode(".", $info['additionalscreenshots'][$i]));
-                                                $title = str_replace("_"," ",basename($info['additionalscreenshots'][$i], ".".$fileext));
-                                                $source = $info['additionalscreenshots'][$i];
+                                                $fileext = pathinfo($info['screenshot'], PATHINFO_EXTENSION);
+                                                $title   = str_replace('_', ' ', basename($info['screenshot'], ".$fileext"));
+                                                $source  = $info['screenshot'];
                                             }
+                                            ?>
 
-                                             ?>
-
-                                            <a href="<?= $URL . "/" . $source ?>"
-                                               data-lightbox="<?= $pluginname ?>"
-                                               data-title="<?= $title ?>">
-                                                <img class="small_thumb"
-                                                     src="<?= $URL . "/" . $source ?>"
-                                                     alt="<?= $pluginname ?>"/>
+                                            <a href="<?= htmlReady("$url/$source") ?>"
+                                               data-lightbox="<?= htmlReady($pluginname) ?>"
+                                               data-title="<?= htmlReady($title) ?>">
+                                                <img class="big_thumb" src="<?= htmlReady("$url/$source") ?>"
+                                                     alt="<?= htmlReady($pluginname) ?>"/>
                                             </a>
 
-                                        <? } ?>
-
+                                            <? if (isset($info['additionalscreenshots'])
+                                                || (isset($info['screenshots']) && count($info['screenshots']) > 1)) :?>
+                                                <div class="thumb_holder">
+                                                    <?
+                                                        if (isset($info['screenshots'])) {
+                                                            $counter = count($info['screenshots']['pictures']);
+                                                            $cstart  = 1;
+                                                        } else {
+                                                            $counter = count($info['additionalscreenshots']);
+                                                            $cstart  = 0;
+                                                        }
+                                                    ?>
+
+                                                    <? for ($i = $cstart; $i < $counter; $i++) :?>
+                                                        <?
+                                                            if (isset($info['screenshots'])) {
+                                                                $title  = $info['screenshots']['pictures'][$i]['title'];
+                                                                $source = $info['screenshots']['path'] . '/' . $info['screenshots']['pictures'][$i]['source'];
+                                                            } else {
+                                                                $fileext = pathinfo($info['additionalscreenshots'][$i], PATHINFO_EXTENSION);
+                                                                $title   = str_replace('_', ' ', basename($info['additionalscreenshots'][$i], ".$fileext"));
+                                                                $source  = $info['additionalscreenshots'][$i];
+                                                            }
+                                                        ?>
+                                                        <a href="<?= htmlReady("$url/$source") ?>"
+                                                           data-lightbox="<?= htmlReady($pluginname) ?>"
+                                                           data-title="<?= htmlReady($title) ?>">
+                                                            <img class="small_thumb"
+                                                                 src="<?= htmlReady("$url/$source") ?>"
+                                                                 alt="<?= htmlReady($pluginname) ?>">
+                                                        </a>
+                                                    <? endfor ?>
+                                                </div>
+                                            <? endif ?>
+                                        <? endif ?>
                                     </div>
-
-                                <? } ?>
-
-                            <? endif ?>
-                        </div>
-
-                        <div class="descriptionbox">
-
-                            <!-- tags -->
-                            <? if (isset($info['keywords'])) : ?>
-                                <ul class="keywords">
-                                    <? foreach (explode(';', $info['keywords']) as $keyword) {
-                                        echo '<li>' . htmlReady($keyword) . '</li>';
-                                    }?>
-                                </ul>
-                            <? endif ?>
-
-                            <!-- longdesc -->
-                            <? if (isset($info['descriptionlong'])) : ?>
-                            <? foreach (explode('\n', $info['descriptionlong']) as $descriptionlong) { ?>
-                                <p class="longdesc">
-                                    <?= htmlReady($descriptionlong) ?>
-                                </p>
-                            <? } ?>
-                            <? endif ?>
-
-                            <? if (!isset($info['descriptionlong']) && isset($info['summary'])) : ?>
-                                <p class="longdesc">
-                                    <? if (isset($info['description'])) : ?>
-                                        <?= htmlReady($info['description']) ?>
-                                    <? else: ?>
-                                        <?= _("Keine Beschreibung vorhanden.") ?>
-                                    <? endif ?>
-                                </p>
-                            <? endif ?>
-
-                            <? if (isset($info['homepage'])) : ?>
-                                <p>
-                                    <strong><?= _('Weitere Informationen:') ?></strong>
-                                    <a href="<?= htmlReady($info['homepage']) ?>"><?= htmlReady($info['homepage']) ?></a>
-                                </p>
-                            <? endif ?>
-
-                            <!-- helplink -->
-                            <? if (isset($info['helplink'])) : ?>
-                                <a class="helplink" href=" <?= htmlReady($info['helplink']) ?> ">...mehr</a>
+                                    <div class="descriptionbox">
+                                        <? if (isset($info['keywords'])) : ?>
+                                            <ul class="keywords">
+                                                <? foreach (explode(';', $info['keywords']) as $keyword) : ?>
+                                                    <li><?= htmlReady($keyword) ?> </li>
+                                                <? endforeach ?>
+                                            </ul>
+                                        <? endif ?>
+                                        <? if (isset($info['descriptionlong'])) : ?>
+                                            <? foreach (explode('\n', $info['descriptionlong']) as $descriptionlong) : ?>
+                                                <p class="longdesc">
+                                                    <?= htmlReady($descriptionlong) ?>
+                                                </p>
+                                            <? endforeach ?>
+                                        <? endif ?>
+                                        <? if (!isset($info['descriptionlong']) && isset($info['summary'])) : ?>
+                                            <p class="longdesc">
+                                                <? if (isset($info['description'])) : ?>
+                                                    <?= htmlReady($info['description']) ?>
+                                                <? else: ?>
+                                                    <?= _('Keine Beschreibung vorhanden.') ?>
+                                                <? endif ?>
+                                            </p>
+                                        <? endif ?>
+                                        <? if (isset($info['homepage'])) : ?>
+                                            <p>
+                                                <strong><?= _('Weitere Informationen:') ?></strong>
+                                                <a href="<?= htmlReady($info['homepage']) ?>">
+                                                    <?= htmlReady($info['homepage']) ?>
+                                                </a>
+                                            </p>
+                                        <? endif ?>
+                                        <? if (isset($info['helplink'])) : ?>
+                                            <a class="helplink" href=" <?= htmlReady($info['helplink']) ?> ">
+                                                ...<?= _('mehr') ?>
+                                            </a>
+                                        <? endif ?>
+                                    </div>
+                                </div>
                             <? endif ?>
-
-                        </div>
-                    </div>
-                <? } ?>
-            </td>
-        </tr>
-    <?
-    }
-} ?>
-</tbody>
-
-<tfoot>
-<tr class="hidden-js">
-    <td align="center" colspan="3">
-        <?= Button::create(_('An- / Ausschalten'), 'uebernehmen') ?>
-    </td>
-</tr>
-</tfoot>
-</table>
+                        </td>
+                    </tr>
+                <? endforeach ?>
+            <? endforeach ?>
+        </tbody>
+        <tfoot>
+            <tr class="hidden-js">
+                <td colspan="3">
+                    <?= Button::create(_('An- / Ausschalten'), 'uebernehmen') ?>
+                </td>
+            </tr>
+        </tfoot>
+    </table>
 </form>