diff --git a/system/admin/admin.php b/system/admin/admin.php
index 85979ce..7eb2e45 100644
--- a/system/admin/admin.php
+++ b/system/admin/admin.php
@@ -693,7 +693,7 @@ function get_user_posts()
                 echo '<td>' . format_date($p->date) . '</td>';
                 if (config("views.counter") == "true")
                     echo '<td>' . $p->views . '</td>';
-                echo '<td>' . $p->category . '</td>';
+                echo '<td><a href="' . str_replace('category', 'admin/categories', $p->categoryUrl) . '">'. strip_tags($p->category) .'</a></td>';
                 echo '<td>' . $p->tag . '</td>';
                 echo '<td><a class="btn btn-primary btn-xs" href="' . $p->url . '/edit?destination=admin">' . i18n('Edit') . '</a> <a class="btn btn-danger btn-xs" href="' . $p->url . '/delete?destination=admin">' . i18n('Delete') . '</a></td>';
                 echo '</tr>';
diff --git a/system/admin/views/layout.html.php b/system/admin/views/layout.html.php
index b7dfc45..86b6596 100644
--- a/system/admin/views/layout.html.php
+++ b/system/admin/views/layout.html.php
@@ -103,31 +103,6 @@
               </li>
             </ul>
           </li>
-          <li class="nav-item has-treeview menu-open">
-            <a href="#" class="nav-link">
-              <i class="nav-icon fa fa-user"></i>
-              <p>
-                User
-                <i class="right fa fa-angle-left"></i>
-              </p>
-            </a>
-            <ul class="nav nav-treeview">
-              <li class="nav-item">
-                <a href="<?php echo site_url();?>admin/mine" class="nav-link">
-                  <p>My posts</p>
-                </a>
-              </li>
-              <li class="nav-item">
-                <a href="<?php echo site_url();?>edit/profile" class="nav-link">
-                  <p>Edit profile</p>
-                </a>
-              </li>
-              <li class="nav-item">
-                <a href="<?php echo site_url();?>logout" class="nav-link">
-                  <p>Logout</p>
-                </a>
-              </li>
-            </ul>
           </li>
           <li class="nav-item has-treeview menu-open">
             <a href="#" class="nav-link">
@@ -188,6 +163,31 @@
 			  <?php } ?>
             </ul>
           </li>
+          <li class="nav-item has-treeview menu-open">
+            <a href="#" class="nav-link">
+              <i class="nav-icon fa fa-user"></i>
+              <p>
+                User
+                <i class="right fa fa-angle-left"></i>
+              </p>
+            </a>
+            <ul class="nav nav-treeview">
+              <li class="nav-item">
+                <a href="<?php echo site_url();?>admin/mine" class="nav-link">
+                  <p>My posts</p>
+                </a>
+              </li>
+              <li class="nav-item">
+                <a href="<?php echo site_url();?>edit/profile" class="nav-link">
+                  <p>Edit profile</p>
+                </a>
+              </li>
+              <li class="nav-item">
+                <a href="<?php echo site_url();?>logout" class="nav-link">
+                  <p>Logout</p>
+                </a>
+              </li>
+            </ul>
         </ul>
       </nav>
       <!-- /.sidebar-menu -->
@@ -269,7 +269,7 @@
   </div>
   <span><a href="<?php echo site_url();?>"><svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-left" viewBox="0 0 16 16">
   <path fill-rule="evenodd" d="M15 8a.5.5 0 0 0-.5-.5H2.707l3.147-3.146a.5.5 0 1 0-.708-.708l-4 4a.5.5 0 0 0 0 .708l4 4a.5.5 0 0 0 .708-.708L2.707 8.5H14.5A.5.5 0 0 0 15 8z"/>
-</svg> Back to <?php echo blog_title();?> frontpage</a></span>
+</svg> Back to <?php echo blog_title();?></a></span>
   
 </div>
 <?php } ?>
diff --git a/system/admin/views/login.html.php b/system/admin/views/login.html.php
index 1d28b90..5313dc4 100644
--- a/system/admin/views/login.html.php
+++ b/system/admin/views/login.html.php
@@ -10,14 +10,14 @@
             if (empty($username)) {
                 echo 'error';
             }
-        } ?>" name="user"/>
+        } ?>" name="user" placeholder="Username"/>
 		<br>
         <label>Password <span class="required">*</span></label>
         <input type="password" class="form-control <?php if (isset($password)) {
             if (empty($password)) {
                 echo 'error';
             }
-        } ?>" name="password"/>
+        } ?>" name="password" placeholder="Password"/>
 		<br>
         <input type="hidden" name="csrf_token" value="<?php echo get_csrf() ?>">
         <?php if (config('google.reCaptcha') === 'true'): ?>
diff --git a/system/admin/views/popular-posts.html.php b/system/admin/views/popular-posts.html.php
index f88172b..894ff62 100644
--- a/system/admin/views/popular-posts.html.php
+++ b/system/admin/views/popular-posts.html.php
@@ -32,7 +32,8 @@
                 <?php if (config("views.counter") == "true"): ?>
                     <td><?php echo $p->views ?></td><?php endif; ?>
                 <td><a target="_blank" href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></td>
-                <td><?php echo $p->category ?></td>
+                <td><a href="<?php echo str_replace('category', 'admin/categories', $p->categoryUrl); ?>"><?php echo strip_tags($p->category);?></td>
+                <td><?php echo $p->tag ?></td>
                 <td><?php echo $p->tag ?></td>
                 <td><a class="btn btn-primary btn-xs" href="<?php echo $p->url ?>/edit?destination=admin/posts">Edit</a> <a
                         class="btn btn-danger btn-xs" href="<?php echo $p->url ?>/delete?destination=admin/posts">Delete</a></td>
diff --git a/system/admin/views/posts-list.html.php b/system/admin/views/posts-list.html.php
index bf2152d..bc04b1e 100644
--- a/system/admin/views/posts-list.html.php
+++ b/system/admin/views/posts-list.html.php
@@ -32,7 +32,7 @@
                 <?php if (config("views.counter") == "true"): ?>
                     <td><?php echo $p->views ?></td><?php endif; ?>
                 <td><a target="_blank" href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></td>
-                <td><?php echo $p->category ?></td>
+                <td><a href="<?php echo str_replace('category', 'admin/categories', $p->categoryUrl); ?>"><?php echo strip_tags($p->category);?></td>
                 <td><?php echo $p->tag ?></td>
                 <td><a class="btn btn-primary btn-xs" href="<?php echo $p->url ?>/edit?destination=admin/posts"><?php echo i18n('Edit');?></a> <a
                         class="btn btn-danger btn-xs" href="<?php echo $p->url ?>/delete?destination=admin/posts"><?php echo i18n('Delete');?></a></td>
diff --git a/system/admin/views/user-draft.html.php b/system/admin/views/user-draft.html.php
index f1c9196..2daedea 100644
--- a/system/admin/views/user-draft.html.php
+++ b/system/admin/views/user-draft.html.php
@@ -27,7 +27,8 @@
             <tr class="<?php echo $class ?>">
                 <td><?php echo $p->title ?></td>
                 <td><?php echo format_date($p->date) ?></td>
-                <td><?php echo strip_tags($p->category) ?></td>
+                <td><a href="<?php echo str_replace('category', 'admin/categories', $p->categoryUrl); ?>"><?php echo strip_tags($p->category);?></td>
+                <td><?php echo $p->tag ?></td>
                 <td><?php echo strip_tags($p->tag) ?></td>
                 <td><a class="btn btn-primary btn-xs" href="<?php echo $p->url ?>/edit?destination=admin/draft"><?php echo i18n('Edit');?></a> <a class="btn btn-danger btn-xs" href="<?php echo $p->url ?>/delete?destination=admin/draft"><?php echo i18n('Delete');?></a></td>
             </tr>
diff --git a/system/admin/views/user-posts.html.php b/system/admin/views/user-posts.html.php
index 4adc3f5..153d568 100644
--- a/system/admin/views/user-posts.html.php
+++ b/system/admin/views/user-posts.html.php
@@ -33,7 +33,8 @@
                 <?php if (config("views.counter") == "true"): ?>
                     <td><?php echo $p->views ?></td>
                 <?php endif; ?>
-                <td><?php echo $p->category ?></td>
+                <td><a href="<?php echo str_replace('category', 'admin/categories', $p->categoryUrl); ?>"><?php echo strip_tags($p->category);?></td>
+                <td><?php echo $p->tag ?></td>
                 <td><?php echo $p->tag ?></td>
                 <td><a class="btn btn-primary btn-xs" href="<?php echo $p->url ?>/edit?destination=admin/mine">Edit</a> <a class="btn btn-danger btn-xs" href="<?php echo $p->url ?>/delete?destination=admin/mine"><?php echo i18n('Delete');?></a></td>
             </tr>
diff --git a/system/includes/functions.php b/system/includes/functions.php
index aa50ca7..101717d 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -268,12 +268,14 @@ function get_posts($posts, $page = 1, $perpage = 0)
         if($str[count($str) - 3] == 'uncategorized') {
             $category = default_category();
             $post->category = '<a href="' . $category->url . '">' . $category->title . '</a>';
+            $post->categoryUrl = $category->url;
             $post->categoryb = '<a itemprop="item" href="' . $category->url . '"><span itemprop="name">' . $category->title . '</span></a>';
         } else {
 
             foreach ($catC as $k => $v) {
                 if ($v['0'] === $str[count($str) - 3]) {
                     $post->category = '<a href="' . site_url() . 'category/' . $v['0'] . '">' . $v['1'] . '</a>';
+                    $post->categoryUrl = site_url() . 'category/' . $v['0'];
                     $post->categoryb = '<a itemprop="item" href="' . site_url() . 'category/' . $v['0'] . '"><span itemprop="name">' . $v['1'] . '</span></a>';
                 }
             }
@@ -2083,7 +2085,7 @@ function menu($class = null)
                 $nodes = $element->childNodes;
                 foreach ($nodes as $node) {
 		            $class = $node->getAttribute('class');
-		            if (stripos ($class, 'active')) {
+		            if (stripos($class, 'active')) {
 						$parentClass = $element->parentNode->getAttribute('class') . ' active';
 			            $element->parentNode->setAttribute('class', $parentClass);
 		            }