diff --git a/Theme/Backend/wiki-app-create.tpl.php b/Theme/Backend/wiki-app-create.tpl.php
index c7a346b..babad1d 100644
--- a/Theme/Backend/wiki-app-create.tpl.php
+++ b/Theme/Backend/wiki-app-create.tpl.php
@@ -14,7 +14,5 @@ declare(strict_types=1);
 
 $app = $this->getData('app');
 
-/**
- * @var \phpOMS\Views\View $this
- */
+/** @var \phpOMS\Views\View $this */
 echo $this->getData('nav')->render();
diff --git a/Theme/Backend/wiki-app-list.tpl.php b/Theme/Backend/wiki-app-list.tpl.php
index 211a9e0..fed624f 100644
--- a/Theme/Backend/wiki-app-list.tpl.php
+++ b/Theme/Backend/wiki-app-list.tpl.php
@@ -14,7 +14,5 @@ declare(strict_types=1);
 
 $apps = $this->getData('apps');
 
-/**
- * @var \phpOMS\Views\View $this
- */
+/** @var \phpOMS\Views\View $this */
 echo $this->getData('nav')->render();
diff --git a/Theme/Backend/wiki-app-single.tpl.php b/Theme/Backend/wiki-app-single.tpl.php
index c7a346b..babad1d 100644
--- a/Theme/Backend/wiki-app-single.tpl.php
+++ b/Theme/Backend/wiki-app-single.tpl.php
@@ -14,7 +14,5 @@ declare(strict_types=1);
 
 $app = $this->getData('app');
 
-/**
- * @var \phpOMS\Views\View $this
- */
+/** @var \phpOMS\Views\View $this */
 echo $this->getData('nav')->render();
diff --git a/Theme/Backend/wiki-category-list.tpl.php b/Theme/Backend/wiki-category-list.tpl.php
index 7cb01e3..611d050 100644
--- a/Theme/Backend/wiki-category-list.tpl.php
+++ b/Theme/Backend/wiki-category-list.tpl.php
@@ -16,9 +16,7 @@ use phpOMS\Uri\UriFactory;
 
 $categories = $this->getData('categories');
 
-/**
- * @var \phpOMS\Views\View $this
- */
+/** @var \phpOMS\Views\View $this */
 echo $this->getData('nav')->render();
 ?>
 
diff --git a/Theme/Backend/wiki-dashboard.tpl.php b/Theme/Backend/wiki-dashboard.tpl.php
index 8cb4272..ea115fa 100644
--- a/Theme/Backend/wiki-dashboard.tpl.php
+++ b/Theme/Backend/wiki-dashboard.tpl.php
@@ -14,18 +14,14 @@ declare(strict_types=1);
 
 use \phpOMS\Uri\UriFactory;
 
-/**
- * @var \Modules\Knowledgebase\Models\WikiCategory[] $categories
- * @var \Modules\Knowledgebase\Models\WikiDoc[]      $documents
- */
+/** @var \phpOMS\Views\View $this */
+/** @var \Modules\Knowledgebase\Models\WikiCategory[] $categories */
 $categories = $this->getData('categories') ?? [];
-$documents  = $this->getData('docs') ?? [];
 
-/**
- * @var \phpOMS\Views\View $this
- */
+/** @var \Modules\Knowledgebase\Models\WikiDoc[] $documents */
+$documents = $this->getData('docs') ?? [];
+
 echo $this->getData('nav')->render(); ?>
-
 <div class="row">
     <div class="col-xs-12 col-md-8 col-lg-9">
         <div class="row">
diff --git a/Theme/Backend/wiki-doc-single.tpl.php b/Theme/Backend/wiki-doc-single.tpl.php
index 3f77888..5ac64b2 100644
--- a/Theme/Backend/wiki-doc-single.tpl.php
+++ b/Theme/Backend/wiki-doc-single.tpl.php
@@ -20,32 +20,48 @@ use Modules\Knowledgebase\Models\NullWikiDoc;
  * @var \Modules\Knowledgebase\Models\WikiDoc        $doc
  */
 $categories = $this->getData('categories') ?? [];
-$doc        = $this->getData('document') ?? new NullWikiDoc();
-$tags       = $doc->getTags();
 
-/**
- * @var \phpOMS\Views\View $this
- */
+/** @var \Modules\Knowledgebase\Models\WikiDoc $doc */
+$doc = $this->getData('document') ?? new NullWikiDoc();
+
+/** @var \Modules\Tag\Models\Tag[] $tag */
+$tags = $doc->getTags();
+
+/** @var bool $editable */
+$editable = $this->getData('editable');
+
+/** @var \phpOMS\Views\View $this */
 echo $this->getData('nav')->render();
 ?>
 
 <div class="row">
     <div class="col-xs-12 col-md-8 col-lg-9">
-        <div class="portlet">
+        <section class="portlet">
             <div class="portlet-head"><?= $this->printHtml($doc->getName()); ?></div>
             <div class="portlet-body">
                 <article><?= $doc->getDoc(); ?></article>
             </div>
+            <?php if ($editable || !empty($tags)) : ?>
             <div class="portlet-foot">
-                <?php foreach ($tags as $tag) : ?>
-                    <span class="tag" style="background: <?= $this->printHtml($tag->getColor()); ?>"><?= $this->printHtml($tag->getTitle()); ?></span>
-                <?php endforeach; ?>
+                <div class="row">
+                    <div class="col-xs-6 overflowfix">
+                        <?php foreach ($tags as $tag) : ?>
+                            <span class="tag" style="background: <?= $this->printHtml($tag->getColor()); ?>"><?= $this->printHtml($tag->getTitle()); ?></span>
+                        <?php endforeach; ?>
+                    </div>
+                    <?php if ($editable) : ?>
+                    <div class="col-xs-6 rightText">
+                        <a tabindex="0" class="button" href="<?= \phpOMS\Uri\UriFactory::build('{/prefix}wiki/doc/edit?id=' . $doc->getId()); ?>">Edit</a>
+                    </div>
+                    <?php endif; ?>
+                </div>
             </div>
-        </div>
+            <?php endif; ?>
+        </section>
     </div>
 
     <div class="col-xs-12 col-md-4 col-lg-3">
-        <section class="box wf-100">
+        <section class="portlet">
             <div class="inner">
                 <ul>
                     <?php foreach ($categories as $category) : ?>