diff --git a/Controller.php b/Controller.php
index a7cb42a..6231521 100644
--- a/Controller.php
+++ b/Controller.php
@@ -40,7 +40,7 @@ use phpOMS\Message\Http\RequestStatusCode;
  * @link       http://website.orange-management.de
  * @since      1.0.0
  */
-class Controller extends ModuleAbstract implements WebInterface
+final class Controller extends ModuleAbstract implements WebInterface
 {
 
     /**
diff --git a/Models/NullCollection.php b/Models/NullCollection.php
index e2f252e..146fe99 100644
--- a/Models/NullCollection.php
+++ b/Models/NullCollection.php
@@ -22,6 +22,6 @@ namespace Modules\Media\Models;
  * @link       http://website.orange-management.de
  * @since      1.0.0
  */
-class NullCollection extends Collection
+final class NullCollection extends Collection
 {
 }
diff --git a/Models/NullMedia.php b/Models/NullMedia.php
index 899ddd1..5c78005 100644
--- a/Models/NullMedia.php
+++ b/Models/NullMedia.php
@@ -22,6 +22,6 @@ namespace Modules\Media\Models;
  * @link       http://website.orange-management.de
  * @since      1.0.0
  */
-class NullMedia extends Media
+final class NullMedia extends Media
 {
 }
diff --git a/Theme/Backend/media-list.tpl.php b/Theme/Backend/media-list.tpl.php
index e8347c5..a2fba10 100644
--- a/Theme/Backend/media-list.tpl.php
+++ b/Theme/Backend/media-list.tpl.php
@@ -34,25 +34,24 @@ echo $this->getData('nav')->render(); ?>
                     <td><?= $this->getHtml('Size') ?>
                     <td><?= $this->getHtml('Creator') ?>
                     <td><?= $this->getHtml('Created') ?>
-                        <tfoot>
-                <tr>
-                    <td colspan="3">
-                        <tbody>
-                        <?php $count = 0; foreach ($media as $key => $value) : $count++;
-                        $url  = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/media/single?{?}&id=' . $value->getId());
-                        $icon = $fileIconFunction(\phpOMS\System\File\FileUtils::getExtensionType($value->getExtension()));
+                <tbody>
+                    <?php $count = 0; 
+                        foreach ($media as $key => $value) : 
+                            $count++;
+                            $url  = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/media/single?{?}&id=' . $value->getId());
+                            $icon = $fileIconFunction(\phpOMS\System\File\FileUtils::getExtensionType($value->getExtension()));
                         ?>
-                        <tr data-href="<?= $url; ?>">
-                            <td data-label="<?= $this->getHtml('Type') ?>"><a href="<?= $url; ?>"><i class="fa fa-<?= $this->printHtml($icon); ?>"></i></a>
-                            <td data-label="<?= $this->getHtml('Name') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
-                            <td data-label="<?= $this->getHtml('Extension') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getExtension()); ?></a>
-                            <td data-label="<?= $this->getHtml('Size') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getSize()); ?></a>
-                            <td data-label="<?= $this->getHtml('Creator') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedBy()->getName1()); ?></a>
-                            <td data-label="<?= $this->getHtml('Created') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedAt()->format('Y-m-d H:i:s')); ?></a>
+                    <tr data-href="<?= $url; ?>">
+                        <td data-label="<?= $this->getHtml('Type') ?>"><a href="<?= $url; ?>"><i class="fa fa-<?= $this->printHtml($icon); ?>"></i></a>
+                        <td data-label="<?= $this->getHtml('Name') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getName()); ?></a>
+                        <td data-label="<?= $this->getHtml('Extension') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getExtension()); ?></a>
+                        <td data-label="<?= $this->getHtml('Size') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getSize()); ?></a>
+                        <td data-label="<?= $this->getHtml('Creator') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedBy()->getName1()); ?></a>
+                        <td data-label="<?= $this->getHtml('Created') ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->getCreatedAt()->format('Y-m-d H:i:s')); ?></a>
                         <?php endforeach; ?>
-                        <?php if ($count === 0) : ?>
-                <tr><td colspan="5" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
-                        <?php endif; ?>
+                    <?php if ($count === 0) : ?>
+                        <tr><td colspan="6" class="empty"><?= $this->getHtml('Empty', 0, 0); ?>
+                    <?php endif; ?>
             </table>
         </div>
     </div>