diff --git a/system/admin/admin.php b/system/admin/admin.php
index 8afcb56..37855be 100644
--- a/system/admin/admin.php
+++ b/system/admin/admin.php
@@ -58,7 +58,7 @@ function session($user, $pass)
             $_SESSION[config("site.url")]['user'] = $user;
             header('location: admin');
         } else {
-            return $str = '<li>Your username and password mismatch.</li>';        
+            return $str = '<li>Your username and password mismatch.</li>';
         }
     } else if (old_password_verify($pass, $user_enc, $user_pass)) {
         update_user($user, $pass, $user_role);
@@ -104,46 +104,46 @@ function add_content($title, $tag, $url, $content, $user, $description = null, $
         $tagmd = "\n<!--tag " . $post_tagmd . " tag-->";
     } else {
         $tagmd = "";
-    }  
+    }
     if ($media!== null) {
         $post_media = "\n<!--" .$type. " " . $post_media . " " .$type. "-->";
     } else {
         $post_media = "";
-    }        
+    }
     $post_content = "<!--t " . $post_title . " t-->" . $post_description . $tagmd . $post_media . "\n\n" . $content;
 
     if (!empty($post_title) && !empty($post_tag) && !empty($post_url) && !empty($post_content)) {
-        
+
         if (get_magic_quotes_gpc()) {
             $post_content = stripslashes($post_content);
         }
-        
+
         $filename = $post_date . '_' . $post_tag . '_' . $post_url . '.md';
-        
+
         if (empty($draft)) {
             $dir = 'content/' . $user . '/blog/' . $category. '/'.$type. '/';
         } else {
             $dir = 'content/' . $user . '/blog/' . $category. '/draft/';
         }
-        
+
         if (is_dir($dir)) {
             file_put_contents($dir . $filename, print_r($post_content, true));
         } else {
             mkdir($dir, 0775, true);
             file_put_contents($dir . $filename, print_r($post_content, true));
         }
-        
+
         save_tag_i18n($post_tag, $post_tagmd);
 
         rebuilt_cache('all');
         clear_post_cache($post_date, $post_tag, $post_url, $dir . $filename, $category, $type);
-        
+
         if (empty($draft)) {
             $redirect = site_url() . 'admin/mine';
         } else {
             $redirect = site_url() . 'admin/draft';
         }
-        
+
         header("Location: $redirect");
     }
 }
@@ -154,7 +154,7 @@ function edit_content($title, $tag, $url, $content, $oldfile, $destination = nul
     $oldurl = explode('_', $oldfile);
     $dir = explode('/', $oldurl[0]);
     $olddate = date('Y-m-d-H-i-s', strtotime($date));
-    
+
     if ($date !== null) {
         $oldurl[0] = substr($oldurl[0], 0, strrpos($oldurl[0], '/')) . '/' . $olddate;
     }
@@ -177,47 +177,47 @@ function edit_content($title, $tag, $url, $content, $oldfile, $destination = nul
         $tagmd = "\n<!--tag " . $post_tagmd . " tag-->";
     } else {
         $tagmd = "";
-    }     
+    }
     if ($media !== null) {
         $post_media = "\n<!--" . $type . " " . $post_media. " " . $type . "-->";
     } else {
         $post_media = "";
-    }    
+    }
     $post_content = "<!--t " . $post_title . " t-->" . $post_description . $tagmd . $post_media . "\n\n" . $content;
 
     if (!empty($post_title) && !empty($post_tag) && !empty($post_url) && !empty($post_content)) {
-    
+
         if (get_magic_quotes_gpc()) {
             $post_content = stripslashes($post_content);
         }
-        
+
         if(!empty($revertPost) || !empty($publishDraft)) {
-        
+
             $dirBlog = $dir[0] . '/' . $dir[1] . '/' . $dir[2] . '/' . $category . '/' . $type . '/';
             $dirDraft = $dir[0] . '/' . $dir[1] . '/' . $dir[2] . '/' . $category . '/draft/';
-        
+
             if($dir[4] == 'draft') {
-                $filename = $dirBlog . $olddate . '_' . $post_tag . '_' . $post_url . '.md'; 
+                $filename = $dirBlog . $olddate . '_' . $post_tag . '_' . $post_url . '.md';
             } else {
-                $filename = $dirDraft . $olddate . '_' . $post_tag . '_' . $post_url . '.md'; 
+                $filename = $dirDraft . $olddate . '_' . $post_tag . '_' . $post_url . '.md';
             }
-            
+
             if (is_dir($dirBlog)) {
             } else {
-                mkdir($dirBlog, 0775, true);  
+                mkdir($dirBlog, 0775, true);
             }
-            
+
             if (is_dir($dirDraft)) {
             } else {
-                mkdir($dirDraft, 0775, true);  
+                mkdir($dirDraft, 0775, true);
             }
-            
+
             file_put_contents($filename, print_r($post_content, true));
             unlink($oldfile);
             $newfile = $olddate . '_' . $post_tag . '_' . $post_url . '.md';
-            
+
         } else {
-        
+
             if ($dir[3] === $category) {
                 $newfile = $oldurl[0] . '_' . $post_tag . '_' . $post_url . '.md';
                 if ($oldfile === $newfile) {
@@ -227,37 +227,37 @@ function edit_content($title, $tag, $url, $content, $oldfile, $destination = nul
                     file_put_contents($newfile, print_r($post_content, true));
                 }
             } else {
-            
+
                 $dirBlog = $dir[0] . '/' . $dir[1] . '/' . $dir[2] . '/' . $category . '/' . $type. '/';
                 $dirDraft = $dir[0] . '/' . $dir[1] . '/' . $dir[2] . '/' . $category . '/draft/';
 
                 if($dir[4] == 'draft') {
-                    $filename = $dirDraft . $olddate . '_' . $post_tag . '_' . $post_url . '.md'; 
+                    $filename = $dirDraft . $olddate . '_' . $post_tag . '_' . $post_url . '.md';
                 } else {
-                    $filename = $dirBlog . $olddate . '_' . $post_tag . '_' . $post_url . '.md'; 
+                    $filename = $dirBlog . $olddate . '_' . $post_tag . '_' . $post_url . '.md';
                 }
 
                 if (is_dir($dirBlog)) {
                 } else {
-                    mkdir($dirBlog, 0775, true);  
+                    mkdir($dirBlog, 0775, true);
                 }
 
                 if (is_dir($dirDraft)) {
                 } else {
-                    mkdir($dirDraft, 0775, true);  
+                    mkdir($dirDraft, 0775, true);
                 }
 
                 file_put_contents($filename, print_r($post_content, true));
                 unlink($oldfile);
                 $newfile = $olddate . '_' . $post_tag . '_' . $post_url . '.md';
-                
+
             }
-        
+
         }
 
         if(!empty($publishDraft)) {
             $dt = $olddate;
-            $t = str_replace('-', '', $dt); 
+            $t = str_replace('-', '', $dt);
             $time = new DateTime($t);
             $timestamp = $time->format("Y-m-d");
         } else {
@@ -267,19 +267,19 @@ function edit_content($title, $tag, $url, $content, $oldfile, $destination = nul
             $time = new DateTime($t);
             $timestamp = $time->format("Y-m-d");
         }
-        
+
         // The post date
         $postdate = strtotime($timestamp);
-         
+
         // The post URL
         if (config('permalink.type') == 'post') {
             $posturl = site_url() . 'post/' . $post_url;
         } else {
             $posturl = site_url() . date('Y/m', $postdate) . '/' . $post_url;
         }
-        
+
         save_tag_i18n($post_tag, $post_tagmd);
-        
+
         rebuilt_cache('all');
         clear_post_cache($dt, $post_tag, $post_url, $newfile, $category, $type);
         if ($destination == 'post') {
@@ -375,7 +375,7 @@ function add_sub_page($title, $url, $content, $static, $description = null)
 function edit_page($title, $url, $content, $oldfile, $destination = null, $description = null, $static = null)
 {
     $dir = substr($oldfile, 0, strrpos($oldfile, '/'));
-    
+
     $post_title = safe_html($title);
     $post_url = strtolower(preg_replace(array('/[^a-zA-Z0-9 \-\p{L}]/u', '/[ -]+/', '/^-|-$/'), array('', '-', ''), remove_accent($url)));
     $description = safe_html($description);
@@ -410,7 +410,7 @@ function edit_page($title, $url, $content, $oldfile, $destination = null, $descr
         } else {
             $posturl = site_url() . $post_url;
         }
-        
+
         rebuilt_cache('all');
         clear_page_cache($post_url);
         if ($destination == 'post') {
@@ -471,7 +471,7 @@ function edit_category($title, $url, $content, $oldfile, $destination = null, $d
     }
     $post_content = '<!--t ' . $post_title . ' t-->' . $post_description . "\n\n" . $content;
     if (!empty($post_title) && !empty($post_url) && !empty($post_content)) {
-    
+
         if (get_magic_quotes_gpc()) {
             $post_content = stripslashes($post_content);
         }
@@ -482,9 +482,9 @@ function edit_category($title, $url, $content, $oldfile, $destination = null, $d
             rename($oldfile, $newfile);
             file_put_contents($newfile, print_r($post_content, true));
         }
-        
+
         rename_category_folder($post_url, $oldfile);
-        
+
         rebuilt_cache('all');
         if ($destination == 'post') {
             header("Location: $posturl");
@@ -681,7 +681,7 @@ function get_user_posts()
             echo '<tr class="head"><th>' . i18n('Title') . '</th><th>' . i18n('Published') . '</th>';
             if (config("views.counter") == "true")
                 echo '<th>Views</th>';
-            echo '<th>' . i18n('Tag') . '</th><th>' . i18n('Operations') . '</th></tr>';
+            echo '<th>' . i18n('Category') . '</th><th>' . i18n('Tags') . '</th><th>' . i18n('Operations') . '</th></tr>';
             $i = 0;
             $len = count($posts);
             foreach ($posts as $p) {
@@ -698,6 +698,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>' . $p->tag . '</td>';
                 echo '<td><a href="' . $p->url . '/edit?destination=admin">' . i18n('Edit') . '</a> <a href="' . $p->url . '/delete?destination=admin">' . i18n('Delete') . '</a></td>';
                 echo '</tr>';
@@ -815,7 +816,7 @@ function clear_post_cache($post_date, $post_tag, $post_url, $filename, $category
     if (file_exists($p)) {
         unlink($p);
     }
-    
+
     // Delete post permalink
     $pp = 'cache/page/' . $b . 'post#' . $post_url . '.cache';
     if (file_exists($pp)) {
@@ -873,7 +874,7 @@ function clear_post_cache($post_date, $post_tag, $post_url, $filename, $category
     foreach (glob('cache/page/' . $b . 'search#*.cache', GLOB_NOSORT) as $file) {
         unlink($file);
     }
-    
+
     // Delete category
     $cc = 'cache/page/' . $b . 'category#' . $category . '.cache';
     if (file_exists($cc)) {
@@ -882,7 +883,7 @@ function clear_post_cache($post_date, $post_tag, $post_url, $filename, $category
     foreach (glob('cache/page/' . $b . 'category#' . $category . '~*.cache', GLOB_NOSORT) as $file) {
         unlink($file);
     }
-	
+
     // Delete type
     $tp = 'cache/page/' . $b . 'type#' . $type . '.cache';
     if (file_exists($tp)) {
diff --git a/system/admin/views/add-content.html.php b/system/admin/views/add-content.html.php
index d65688a..50ce84d 100644
--- a/system/admin/views/add-content.html.php
+++ b/system/admin/views/add-content.html.php
@@ -1,10 +1,10 @@
-<?php 
+<?php
 
 $type = $type;
 
 if ($type != 'is_post' && $type != 'is_image' && $type != 'is_video' && $type != 'is_audio' && $type != 'is_link' && $type != 'is_quote') {
     $add = site_url() . 'admin/content';
-    header("location: $add");    
+    header("location: $add");
 }
 
 $desc = get_category_info(null);
@@ -12,7 +12,7 @@ $desc = get_category_info(null);
 ?>
 
 <link rel="stylesheet" type="text/css" href="<?php echo site_url() ?>system/admin/editor/css/editor.css"/>
-<script src="<?php echo site_url() ?>system/resources/js/jquery.min.js"></script> 
+<script src="<?php echo site_url() ?>system/resources/js/jquery.min.js"></script>
 <script src="<?php echo site_url() ?>system/resources/js/jquery-ui.min.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Converter.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Sanitizer.js"></script>
@@ -27,77 +27,81 @@ $desc = get_category_info(null);
 
 <div class="wmd-panel">
     <form method="POST">
-        <?php echo i18n('Title');?> <span class="required">*</span>
-        <br>
-        <input type="text" class="text <?php if (isset($postTitle)) { if (empty($postTitle)) { echo 'error';}} ?>" name="title" value="<?php if (isset($postTitle)) { echo $postTitle;} ?>"/>
-        <br><br>
-        <?php echo i18n('Category');?> <span class="required">*</span>
-        <br>
-        <select name="category">
+        <label for="pTitle"><?php echo i18n('Title');?> <span class="required">*</span></label>
+        <br />
+        <input autofocus type="text" class="text <?php if (isset($postTitle)) { if (empty($postTitle)) { echo 'error';}} ?>" id="pTitle" name="title" value="<?php if (isset($postTitle)) { echo $postTitle;} ?>"/>
+        <br /><br />
+        <label for="pCategory"><?php echo i18n('Category');?> <span class="required">*</span></label>
+        <br />
+        <select id="pCategory" name="category">
             <option value="uncategorized"><?php echo i18n("Uncategorized");?></option>
             <?php foreach ($desc as $d):?>
                 <option value="<?php echo $d->md;?>"><?php echo $d->title;?></option>
             <?php endforeach;?>
-        </select> 
-        <br><br>
-        Tag <span class="required">*</span>
-        <br>
-        <input type="text" class="text <?php if (isset($postTag)) { if (empty($postTag)) { echo 'error';}} ?>" name="tag" value="<?php if (isset($postTag)) { echo $postTag; } ?>"/>
-        <br><br>
-        Url (optional)<br><input type="text" class="text" name="url" value="<?php if (isset($postUrl)) { echo $postUrl;} ?>"/>
-        <br>
+        </select>
+        <br /><br />
+        <label for="pTag">Tag <span class="required">*</span></label>
+        <br />
+        <input type="text" class="text <?php if (isset($postTag)) { if (empty($postTag)) { echo 'error';}} ?>" id="pTag" name="tag" value="<?php if (isset($postTag)) { echo $postTag; } ?>"/>
+        <br /><br />
+        <label for="pURL">Url (optional)</label>
+        <br />
+        <input type="text" class="text" id="pURL" name="url" value="<?php if (isset($postUrl)) { echo $postUrl;} ?>"/>
+        <br />
         <span class="help">If the url leave empty we will use the post title.</span>
-        <br><br>
-        <?php echo i18n('Meta_description');?> (optional)<br>
-        <textarea name="description" rows="3" cols="20"><?php if (isset($p->description)) { echo $p->description;} ?></textarea>
-        <br><br>
-        
+        <br /><br />
+        <label for="pMeta"><?php echo i18n('Meta_description');?> (optional)</label>
+        <br />
+        <textarea id="pMeta" name="description" rows="3" cols="20"><?php if (isset($p->description)) { echo $p->description;} ?></textarea>
+        <br /><br />
+
         <?php if ($type == 'is_audio'):?>
-        Featured Audio <span class="required">*</span> (SoundCloud Only)
-        <br>
-        <textarea rows="3" cols="20" class="text <?php if (isset($postAudio)) { if (empty($postAudio)) { echo 'error';} } ?>" name="audio"><?php if (isset($postAudio)) { echo $postAudio;} ?></textarea>
+        <label for="pAudio">Featured Audio <span class="required">*</span> (SoundCloud Only)</label>
+        <br />
+        <textarea rows="3" cols="20" class="text <?php if (isset($postAudio)) { if (empty($postAudio)) { echo 'error';} } ?>" id="pAudio" name="audio"><?php if (isset($postAudio)) { echo $postAudio;} ?></textarea>
         <input type="hidden" name="is_audio" value="is_audio">
-        <br>
+        <br />
         <?php endif;?>
-        
+
         <?php if ($type == 'is_video'):?>
-        Featured Video <span class="required">*</span> (Youtube Only)
-        <br>
-        <textarea rows="3" cols="20" class="text <?php if (isset($postVideo)) { if (empty($postVideo)) { echo 'error';} } ?>" name="video"><?php if (isset($postVideo)) { echo $postVideo;} ?></textarea>
+        <label for="pVideo">Featured Video <span class="required">*</span> (Youtube Only)</label>
+        <br />
+        <textarea rows="3" cols="20" class="text <?php if (isset($postVideo)) { if (empty($postVideo)) { echo 'error';} } ?>" id="pVideo" name="video"><?php if (isset($postVideo)) { echo $postVideo;} ?></textarea>
         <input type="hidden" name="is_video" value="is_video">
-        <br>
+        <br />
         <?php endif;?>
-        
+
         <?php if ($type == 'is_image'):?>
-        Featured Image <span class="required">*</span>
-        <br>
-        <textarea rows="3" cols="20" class="text <?php if (isset($postImage)) { if (empty($postImage)) { echo 'error';} } ?>" name="image"><?php if (isset($postImage)) { echo $postImage;} ?></textarea>
+        <label for="pImage">Featured Image <span class="required">*</span></label>
+        <br />
+        <textarea rows="3" cols="20" class="text <?php if (isset($postImage)) { if (empty($postImage)) { echo 'error';} } ?>" id="pImage" name="image"><?php if (isset($postImage)) { echo $postImage;} ?></textarea>
         <input type="hidden" name="is_image" value="is_image">
-        <br>
+        <br />
         <?php endif;?>
-        
+
         <?php if ($type == 'is_quote'):?>
-        Featured Quote <span class="required">*</span>
-        <br>
-        <textarea rows="3" cols="20" class="text <?php if (isset($postQuote)) { if (empty($postQuote)) { echo 'error';} } ?>" name="quote"><?php if (isset($postQuote)) { echo $postQuote;} ?></textarea>
+        <label for="pQuote">Featured Quote <span class="required">*</span></label>
+        <br />
+        <textarea rows="3" cols="20" class="text <?php if (isset($postQuote)) { if (empty($postQuote)) { echo 'error';} } ?>" id="pQuote" name="quote"><?php if (isset($postQuote)) { echo $postQuote;} ?></textarea>
         <input type="hidden" name="is_quote" value="is_quote">
-        <br>
+        <br />
         <?php endif;?>
-        
+
         <?php if ($type == 'is_link'):?>
-        Featured Link <span class="required">*</span>
-        <br>
-        <textarea rows="3" cols="20" class="text <?php if (isset($postLink)) { if (empty($postLink)) { echo 'error';} } ?>" name="link"><?php if (isset($postLink)) { echo $postLink;} ?></textarea>
+        <label for="pLink">Featured Link <span class="required">*</span></label>
+        <br />
+        <textarea rows="3" cols="20" class="text <?php if (isset($postLink)) { if (empty($postLink)) { echo 'error';} } ?>" id="pLink" name="link"><?php if (isset($postLink)) { echo $postLink;} ?></textarea>
         <input type="hidden" name="is_link" value="is_link">
-        <br>
+        <br />
         <?php endif;?>
-        
+
         <?php if ($type == 'is_post'):?>
         <input type="hidden" name="is_post" value="is_post">
         <?php endif;?>
+        <label for="wmd-input">Content</label>
         <div id="wmd-button-bar" class="wmd-button-bar"></div>
         <textarea id="wmd-input" class="wmd-input <?php if (isset($postContent)) { if (empty($postContent)) { echo 'error'; } } ?>" name="content" cols="20" rows="10"><?php if (isset($postContent)) { echo $postContent;} ?></textarea>
-        <br/>
+        <br />
         <input type="hidden" name="csrf_token" value="<?php echo get_csrf() ?>">
         <input type="submit" name="publish" class="submit" value="<?php echo i18n('Publish');?>"/> <input type="submit" name="draft" class="draft" value="<?php echo i18n('Save_as_draft');?>"/>
     </form>
diff --git a/system/admin/views/add-page.html.php b/system/admin/views/add-page.html.php
index 22051d7..5fb3bf2 100644
--- a/system/admin/views/add-page.html.php
+++ b/system/admin/views/add-page.html.php
@@ -1,5 +1,5 @@
 <link rel="stylesheet" type="text/css" href="<?php echo site_url() ?>system/admin/editor/css/editor.css"/>
-<script src="<?php echo site_url() ?>system/resources/js/jquery.min.js"></script> 
+<script src="<?php echo site_url() ?>system/resources/js/jquery.min.js"></script>
 <script src="<?php echo site_url() ?>system/resources/js/jquery-ui.min.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Converter.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Sanitizer.js"></script>
@@ -14,21 +14,28 @@
 
 <div class="wmd-panel">
 	<form method="POST">
-		Title <span class="required">*</span>
-		<br>
-		<input type="text" class="text <?php if (isset($postTitle)) {if (empty($postTitle)) {echo 'error';}} ?>" name="title" value="<?php if (isset($postTitle)) {echo $postTitle;} ?>"/>
-		<br><br>
-		Url (optional)<br><input type="text" class="text" name="url" value="<?php if (isset($postUrl)) {echo $postUrl;} ?>"/>
-		<br>
+		<label for="pTitle">Title <span class="required">*</span></label>
+		<br />
+		<input type="text" class="text <?php if (isset($postTitle)) {if (empty($postTitle)) {echo 'error';}} ?>" id="pTitle" name="title" value="<?php if (isset($postTitle)) {echo $postTitle;} ?>"/>
+		<br /><br />
+		<?php if ($type == 'is_page') :?>
+		<label for="pURL">Url (optional)</label>
+		<br />
+		<input type="text" class="text" id="pURL" name="url" value="<?php if (isset($postUrl)) {echo $postUrl;} ?>"/>
+		<br />
 		<span class="help">If the url leave empty we will use the page title.</span>
-		<br><br>
-		Meta Description (optional)
-		<br>
-		<textarea name="description" rows="3" cols="20"><?php if (isset($p->description)) {echo $p->description;} ?></textarea>
-		<br><br>
+		<br /><br />
+		<label for="pMeta">Meta Description (optional)</label>
+		<br />
+		<textarea id="pMeta" name="description" rows="3" cols="20"><?php if (isset($p->description)) {echo $p->description;} ?></textarea>
+		<br /><br />
+		<?php endif;?>
+		<label for="wmd-input">Content</label>
+		<?php if ($type == 'is_page') :?>
 		<div id="wmd-button-bar" class="wmd-button-bar"></div>
+		<?php endif;?>
 		<textarea id="wmd-input" class="wmd-input <?php if (isset($postContent)) {if (empty($postContent)) {echo 'error';}} ?>" name="content" cols="20" rows="10"><?php if (isset($postContent)) {echo $postContent;} ?></textarea>
-		<br/>
+		<br />
 		<input type="hidden" name="csrf_token" value="<?php echo get_csrf() ?>">
 		<?php if ($type == 'is_page') :?>
 		<input type="submit" name="submit" class="submit" value="Publish"/>
diff --git a/system/admin/views/config.html.php b/system/admin/views/config.html.php
index 2ad86e5..b6fa129 100644
--- a/system/admin/views/config.html.php
+++ b/system/admin/views/config.html.php
@@ -41,7 +41,7 @@
         foreach ($array as $key => $value) {
             echo '<tr>';
             echo '<td><label for="' . $key . '">' . $key . '</label></td>';
-            echo '<td><input type="text" name="-config-' . $key . '" value="' . valueMaker($value) . '"></td>';
+            echo '<td><input type="text" id="' . $key . '" name="-config-' . $key . '" value="' . valueMaker($value) . '"></td>';
             echo '</tr>';
         }
         ?>
diff --git a/system/admin/views/edit-content.html.php b/system/admin/views/edit-content.html.php
index 39ee212..0188e09 100644
--- a/system/admin/views/edit-content.html.php
+++ b/system/admin/views/edit-content.html.php
@@ -56,7 +56,7 @@ if (config('permalink.type') == 'post') {
 
 ?>
 <link rel="stylesheet" type="text/css" href="<?php echo site_url() ?>system/admin/editor/css/editor.css"/>
-<script src="<?php echo site_url() ?>system/resources/js/jquery.min.js"></script> 
+<script src="<?php echo site_url() ?>system/resources/js/jquery.min.js"></script>
 <script src="<?php echo site_url() ?>system/resources/js/jquery-ui.min.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Converter.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Sanitizer.js"></script>
@@ -71,78 +71,84 @@ if (config('permalink.type') == 'post') {
 
 <div class="wmd-panel">
     <form method="POST">
-        <?php echo i18n('Title');?> <span class="required">*</span>
-        <br>
-        <input type="text" name="title" class="text <?php if (isset($postTitle)) { if (empty($postTitle)) { echo 'error';} } ?>" value="<?php echo $oldtitle ?>"/>
-        <br><br>
-        <?php echo i18n('Category');?> <span class="required">*</span>
-        <br>
-        <select name="category">
+        <label for="pTitle"><?php echo i18n('Title');?> <span class="required">*</span></label>
+        <br />
+        <input autofocus type="text" id="pTitle" name="title" class="text <?php if (isset($postTitle)) { if (empty($postTitle)) { echo 'error';} } ?>" value="<?php echo $oldtitle ?>"/>
+        <br /><br />
+        <label for="pCategory"><?php echo i18n('Category');?> <span class="required">*</span></label>
+        <br />
+        <select id="pCategory" name="category">
             <option value="uncategorized"><?php echo i18n("Uncategorized");?></option>
             <?php foreach ($desc as $d):?>
                 <option value="<?php echo $d->md;?>" <?php if($category === $d->md) { echo 'selected="selected"';} ?>><?php echo $d->title;?></option>
             <?php endforeach;?>
-        </select> 
-        <br><br>
-        Tag <span class="required">*</span><br>
-        <input type="text" name="tag" class="text <?php if (isset($postTag)) { if (empty($postTag)) { echo 'error'; } } ?>" value="<?php echo $oldtag ?>"/><br><br>
-        Url (optional)<br>
-        <input type="text" name="url" class="text" value="<?php echo $oldmd ?>"/>
-        <br>
+        </select>
+        <br /><br />
+        <label for="pTag">Tag <span class="required">*</span></label>
+        <br />
+        <input type="text" id="pTag" name="tag" class="text <?php if (isset($postTag)) { if (empty($postTag)) { echo 'error'; } } ?>" value="<?php echo $oldtag ?>"/><br /><br />
+        <label for="pURL">Url (optional)</label>
+        <br />
+        <input type="text" id="pURL" name="url" class="text" value="<?php echo $oldmd ?>"/>
+        <br />
         <span class="help">If the url leave empty we will use the post title.</span>
-        <br><br>
-        Year, Month, Day<br>
-        <input type="date" name="date" class="text" value="<?php echo date('Y-m-d', $postdate); ?>">
-        <br>
-        Hour, Minute, Second<br>
-        <input step="1" type="time" name="time" class="text" value="<?php echo $time->format('H:i:s'); ?>">
-        <br><br>
-        Meta Description (optional)<br>
-        <textarea name="description" rows="3" cols="20"><?php if (isset($p->description)) { echo $p->description; } else { echo $olddescription;} ?></textarea>
-        <br><br>
-        
+        <br /><br />
+        <label for="pDate">Year, Month, Day</label>
+        <br />
+        <input type="date" id="pDate" name="date" class="text" value="<?php echo date('Y-m-d', $postdate); ?>">
+        <br />
+        <label for="pTime">Hour, Minute, Second</label>
+        <br />
+        <input step="1" type="time" id="pTime" name="time" class="text" value="<?php echo $time->format('H:i:s'); ?>">
+        <br /><br />
+        <label for="pMeta">Meta Description (optional)</label>
+        <br />
+        <textarea id="pMeta" name="description" rows="3" cols="20"><?php if (isset($p->description)) { echo $p->description; } else { echo $olddescription;} ?></textarea>
+        <br /><br />
+
         <?php if ($type == 'is_audio'):?>
-        Featured Audio <span class="required">*</span> (SoundCloud Only)
-        <br>
-        <textarea rows="3" cols="20" class="text <?php if (isset($postAudio)) { if (empty($postAudio)) { echo 'error';} } ?>" name="audio"><?php echo $oldaudio; ?></textarea>
+        <label for="pAudio">Featured Audio <span class="required">*</span> (SoundCloud Only)</label>
+        <br />
+        <textarea rows="3" cols="20" class="text <?php if (isset($postAudio)) { if (empty($postAudio)) { echo 'error';} } ?>" id="pAudio" name="audio"><?php echo $oldaudio; ?></textarea>
         <input type="hidden" name="is_audio" value="is_audio">
         <?php endif;?>
-        
+
         <?php if ($type == 'is_video'):?>
-        Featured Video <span class="required">*</span> (Youtube Only)
-        <br>
-        <textarea rows="3" cols="20" class="text <?php if (isset($postVideo)) { if (empty($postVideo)) { echo 'error';} } ?>" name="video"><?php echo $oldvideo ?></textarea>
+        <label for="pVideo">Featured Video <span class="required">*</span> (Youtube Only)</label>
+        <br />
+        <textarea rows="3" cols="20" class="text <?php if (isset($postVideo)) { if (empty($postVideo)) { echo 'error';} } ?>" id="pVideo" name="video"><?php echo $oldvideo ?></textarea>
         <input type="hidden" name="is_video" value="is_video">
         <?php endif;?>
-        
+
         <?php if ($type == 'is_image'):?>
-        Featured Image <span class="required">*</span>
-        <br>
-        <textarea rows="3" cols="20" class="text <?php if (isset($postImage)) { if (empty($postImage)) { echo 'error';} } ?>" name="image"><?php echo $oldimage; ?></textarea>
+        <label for="pImage">Featured Image <span class="required">*</span></label>
+        <br />
+        <textarea rows="3" cols="20" class="text <?php if (isset($postImage)) { if (empty($postImage)) { echo 'error';} } ?>" id="pImage" name="image"><?php echo $oldimage; ?></textarea>
         <input type="hidden" name="is_image" value="is_image">
         <?php endif;?>
-        
+
         <?php if ($type == 'is_quote'):?>
-        Featured Quote <span class="required">*</span>
-        <br>
-        <textarea rows="3" cols="20" class="text <?php if (isset($postQuote)) { if (empty($postQuote)) { echo 'error';} } ?>" name="quote"><?php echo $oldquote ?></textarea>
+        <label for="pQuote">Featured Quote <span class="required">*</span></label>
+        <br />
+        <textarea rows="3" cols="20" class="text <?php if (isset($postQuote)) { if (empty($postQuote)) { echo 'error';} } ?>" id="pQuote" name="quote"><?php echo $oldquote ?></textarea>
         <input type="hidden" name="is_quote" value="is_quote">
         <?php endif;?>
-        
+
         <?php if ($type == 'is_link'):?>
-        Featured Link <span class="required">*</span>
-        <br>
-        <textarea rows="3" cols="20" class="text <?php if (isset($postLink)) { if (empty($postLink)) { echo 'error';} } ?>" name="link"><?php echo $oldlink ?></textarea>
+        <label for="pLink">Featured Link <span class="required">*</span></label>
+        <br />
+        <textarea rows="3" cols="20" class="text <?php if (isset($postLink)) { if (empty($postLink)) { echo 'error';} } ?>" id="pLink" name="link"><?php echo $oldlink ?></textarea>
         <input type="hidden" name="is_link" value="is_link">
         <?php endif;?>
-        
+
         <?php if ($type == 'is_post'):?>
         <input type="hidden" name="is_post" value="is_post">
         <?php endif;?>
-        <br>
+        <br />
+        <label for="wmd-input">Content</label>
         <div id="wmd-button-bar" class="wmd-button-bar"></div>
         <textarea id="wmd-input" class="wmd-input <?php if (isset($postContent)) { if (empty($postContent)) { echo 'error'; } } ?>" name="content" cols="20" rows="10"><?php echo $oldcontent ?></textarea>
-        <br>
+        <br />
         <input type="hidden" name="oldfile" class="text" value="<?php echo $url ?>"/>
         <input type="hidden" name="csrf_token" value="<?php echo get_csrf() ?>">
         <?php if ($isdraft[4] == 'draft') { ?>
diff --git a/system/admin/views/edit-page.html.php b/system/admin/views/edit-page.html.php
index fde8ca1..61ea563 100644
--- a/system/admin/views/edit-page.html.php
+++ b/system/admin/views/edit-page.html.php
@@ -64,7 +64,7 @@ if ($type == 'is_frontpage') {
 
 ?>
 <link rel="stylesheet" type="text/css" href="<?php echo site_url() ?>system/admin/editor/css/editor.css"/>
-<script src="<?php echo site_url() ?>system/resources/js/jquery.min.js"></script> 
+<script src="<?php echo site_url() ?>system/resources/js/jquery.min.js"></script>
 <script src="<?php echo site_url() ?>system/resources/js/jquery-ui.min.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Converter.js"></script>
 <script type="text/javascript" src="<?php echo site_url() ?>system/admin/editor/js/Markdown.Sanitizer.js"></script>
@@ -79,20 +79,25 @@ if ($type == 'is_frontpage') {
 
 <div class="wmd-panel">
 	<form method="POST">
-		<?php echo i18n('Title');?> <span class="required">*</span>
-		<br>
-		<input type="text" name="title" class="text <?php if (isset($postTitle)) { if (empty($postTitle)) { echo 'error'; } } ?>" value="<?php echo $oldtitle ?>"/><br><br>
+		<label for="pTitle"><?php echo i18n('Title');?> <span class="required">*</span></label>
+		<br />
+		<input type="text" id="pTitle" name="title" class="text <?php if (isset($postTitle)) { if (empty($postTitle)) { echo 'error'; } } ?>" value="<?php echo $oldtitle ?>"/><br /><br />
 		<?php if($type != 'is_frontpage' && $type != 'is_profile') { ?>
-		Url (optional)<br><input type="text" name="url" class="text" value="<?php echo $oldmd ?>"/>
-		<br>
+		<label for="pURL">Url (optional)</label>
+		<br />
+		<input type="text" id="pURL" name="url" class="text" value="<?php echo $oldmd ?>"/>
+		<br />
 		<span class="help">If the url leave empty we will use the page title.</span>
-		<br><br>
-		<?php echo i18n('Meta_description');?> (optional)<br><textarea name="description" rows="3" cols="20"><?php if (isset($p->description)) { echo $p->description;} else {echo $olddescription;}?></textarea>
-		<br><br>
+		<br /><br />
+		<label for="pMeta"><?php echo i18n('Meta_description');?> (optional)</label>
+		<br />
+		<textarea id="pMeta" name="description" rows="3" cols="20"><?php if (isset($p->description)) { echo $p->description;} else {echo $olddescription;}?></textarea>
+		<br /><br />
 		<?php } ?>
+		<label for="wmd-input">Content</label>
 		<div id="wmd-button-bar" class="wmd-button-bar"></div>
 		<textarea id="wmd-input" class="wmd-input <?php if (isset($postContent)) {if (empty($postContent)) {echo 'error';}} ?>" name="content" cols="20" rows="10"><?php echo $oldcontent ?></textarea>
-		<br>
+		<br />
 		<input type="hidden" name="csrf_token" value="<?php echo get_csrf() ?>">
 		<?php if($type == 'is_frontpage' || $type == 'is_profile') { ?>
 			<input type="submit" name="submit" class="submit" value="Save"/>
diff --git a/system/admin/views/popular-posts.html.php b/system/admin/views/popular-posts.html.php
index 1265928..03ed3ab 100644
--- a/system/admin/views/popular-posts.html.php
+++ b/system/admin/views/popular-posts.html.php
@@ -6,7 +6,8 @@
             <th><?php echo i18n('Published');?></th><?php if (config("views.counter") == "true"): ?>
                 <th><?php echo i18n('Views');?></th><?php endif; ?>
             <th><?php echo i18n('Author');?></th>
-            <th><?php echo i18n('Tag');?></th>
+            <th><?php echo i18n('Category');?></th>
+            <th><?php echo i18n('Tags');?></th>
             <th><?php echo i18n('Operations');?></th>
         </tr>
         <?php $i = 0;
@@ -28,6 +29,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><?php echo $p->tag ?></td>
                 <td><a href="<?php echo $p->url ?>/edit?destination=admin/posts">Edit</a> <a
                         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 52f6cd4..b618170 100644
--- a/system/admin/views/posts-list.html.php
+++ b/system/admin/views/posts-list.html.php
@@ -6,7 +6,8 @@
             <th><?php echo i18n('Published');?></th><?php if (config("views.counter") == "true"): ?>
                 <th>Views</th><?php endif; ?>
             <th><?php echo i18n('Author');?></th>
-            <th><?php echo i18n('Tag');?></th>
+            <th><?php echo i18n('Category');?></th>
+            <th><?php echo i18n('Tags');?></th>
             <th><?php echo i18n('Operations');?></th>
         </tr>
         <?php $i = 0;
@@ -28,6 +29,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><?php echo $p->tag ?></td>
                 <td><a href="<?php echo $p->url ?>/edit?destination=admin/posts"><?php echo i18n('Edit');?></a> <a
                         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 57d401f..e77a93e 100644
--- a/system/admin/views/user-draft.html.php
+++ b/system/admin/views/user-draft.html.php
@@ -4,7 +4,8 @@
         <tr class="head">
             <th><?php echo i18n('Title');?></th>
             <th><?php echo i18n('Created');?></th>
-            <th><?php echo i18n('Tag');?></th>
+            <th><?php echo i18n('Category');?></th>
+            <th><?php echo i18n('Tags');?></th>
             <th><?php echo i18n('Operations');?></th>
         </tr>
         <?php $i = 0;
@@ -23,6 +24,7 @@
             <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><?php echo strip_tags($p->tag) ?></td>
                 <td><a href="<?php echo $p->url ?>/edit?destination=admin/draft"><?php echo i18n('Edit');?></a> <a 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 7a0a2d3..bf03d6a 100644
--- a/system/admin/views/user-posts.html.php
+++ b/system/admin/views/user-posts.html.php
@@ -7,7 +7,8 @@
 			<?php if (config("views.counter") == "true"): ?>
                 <th>Views</th>
             <?php endif; ?>
-            <th><?php echo i18n('Tag');?></th>
+            <th><?php echo i18n('Category');?></th>
+            <th><?php echo i18n('Tags');?></th>
             <th><?php echo i18n('Operations');?></th>
         </tr>
         <?php $i = 0;
@@ -29,6 +30,7 @@
                 <?php if (config("views.counter") == "true"): ?>
                     <td><?php echo $p->views ?></td>
                 <?php endif; ?>
+                <td><?php echo $p->category ?></td>
                 <td><?php echo $p->tag ?></td>
                 <td><a href="<?php echo $p->url ?>/edit?destination=admin/mine">Edit</a> <a 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 6bb5667..a58db44 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -229,11 +229,11 @@ function rebuilt_cache($type)
         rebuilt_cache('author');
         rebuilt_cache('category');
     }
-    
+
     foreach (glob('cache/widget/*.cache', GLOB_NOSORT) as $file) {
         unlink($file);
     }
-    
+
 }
 
 // Return blog posts.
@@ -247,7 +247,7 @@ function get_posts($posts, $page = 1, $perpage = 0)
 
     // Extract a specific page with results
     $posts = array_slice($posts, ($page - 1) * $perpage, $perpage);
-    
+
     $catC = category_list(true);
 
     foreach ($posts as $index => $v) {
@@ -270,14 +270,14 @@ function get_posts($posts, $page = 1, $perpage = 0)
             $post->category = '<a href="' . $category->url . '">' . $category->title . '</a>';
             $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->categoryb = '<a itemprop="item" href="' . site_url() . 'category/' . $v['0'] . '"><span itemprop="name">' . $v['1'] . '</span></a>';
                 }
             }
-        
+
         }
         $type = $str[count($str) - 2];
         $post->ct = $str[count($str) - 3];
@@ -285,7 +285,7 @@ function get_posts($posts, $page = 1, $perpage = 0)
         // The post author + author url
         $post->author = $author;
         $post->authorUrl = site_url() . 'author/' . $author;
-        
+
         $post->type = $type;
 
         $dt = str_replace($replaced, '', $arr[0]);
@@ -298,13 +298,13 @@ function get_posts($posts, $page = 1, $perpage = 0)
 
         // The archive per day
         $post->archive = site_url() . 'archive/' . date('Y-m', $post->date);
-        
+
         if (config('permalink.type') == 'post') {
             $post->url = site_url() . 'post/' . str_replace('.md', '', $arr[2]);
         } else {
             $post->url = site_url() . date('Y/m', $post->date) . '/' . str_replace('.md', '', $arr[2]);
         }
-        
+
         $post->file = $filepath;
 
         $content = file_get_contents($filepath);
@@ -316,15 +316,15 @@ function get_posts($posts, $page = 1, $perpage = 0)
         $post->link  = get_content_tag('link', $content);
         $post->quote  = get_content_tag('quote', $content);
         $post->audio  = get_content_tag('audio', $content);
-        
+
         $tag = array();
         $url = array();
         $bc = array();
         $rel = array();
-        
+
         $tagt = get_content_tag('tag', $content);
         $t = explode(',', rtrim($arr[1], ','));
-        
+
         if(!empty($tagt)) {
             $tl = explode(',', rtrim($tagt, ','));
             $tCom = array_combine($t, $tl);
@@ -334,13 +334,13 @@ function get_posts($posts, $page = 1, $perpage = 0)
                 } else {
                     $tag[] = array($key, site_url() . 'tag/' . strtolower($key));
                 }
-            } 
+            }
         } else {
             foreach ($t as $tt) {
                 $tag[] = array($tt, site_url() . 'tag/' . strtolower($tt));
             }
         }
-        
+
         foreach ($tag as $a) {
             $url[] = '<a rel="tag" href="' . $a[1] . '">' . $a[0] . '</a>';
             $bc[] = '<span><a href="' . $a[1] . '">' . $a[0] . '</a></span>';
@@ -349,14 +349,14 @@ function get_posts($posts, $page = 1, $perpage = 0)
         $post->tag = implode(' ', $url);
 
         $post->tagb = implode(' » ', $bc);
-    
+
         $post->related = rtrim($arr[1], ',');
-        
+
         $more = explode('<!--more-->', $content);
         if (isset($more['1'])) {
             $content = $more['0']  . '<a id="more"></a><br>' . "\n\n" . '<!--more-->' . $more['1'];
         }
-        
+
         // Get the contents and convert it to HTML
         $post->body = MarkdownExtra::defaultTransform(remove_html_comments($content));
 
@@ -473,13 +473,13 @@ function get_category($category, $page, $perpage)
     $posts = get_post_sorted();
 
     $tmp = array();
-    
+
     if (empty($perpage)) {
-        $perpage = 10;    
+        $perpage = 10;
     }
 
     foreach ($posts as $index => $v) {
-    
+
         $filepath = $v['dirname'] . '/' . $v['basename'];
 
         // Extract the date
@@ -491,7 +491,7 @@ function get_category($category, $page, $perpage)
         // Author string
         $str = explode('/', $replaced);
         $cat = $str[count($str) - 3];
-    
+
         if (strtolower($category) === strtolower($cat)) {
             $tmp[] = $v;
         }
@@ -500,7 +500,7 @@ function get_category($category, $page, $perpage)
     if (empty($tmp)) {
         not_found();
     }
-    
+
     $tmp = array_unique($tmp, SORT_REGULAR);
 
     return $tmp = get_posts($tmp, $page, $perpage);
@@ -525,9 +525,9 @@ function get_category_info($category)
 
                 // The static page URL
                 $url= str_replace($replaced, '', $v);
-                
+
                 $desc->url = site_url() . 'category/' . str_replace('.md', '', $url);
-                
+
                 $desc->md = str_replace('.md', '', $url);
 
                 $desc->file = $v;
@@ -537,7 +537,7 @@ function get_category_info($category)
 
                 // Extract the title and body
                 $desc->title = get_content_tag('t', $content, $category);
-                
+
                 // Get the contents and convert it to HTML
                 $desc->body = MarkdownExtra::defaultTransform(remove_html_comments($content));
 
@@ -547,11 +547,11 @@ function get_category_info($category)
             }
         }
     }
-    
+
     if (strtolower($category) == 'uncategorized') {
         return default_category();
     }
-    
+
     return $tmp;
 }
 
@@ -573,19 +573,19 @@ function default_category()
 // Return category list
 
 function category_list($custom = null) {
-    
+
     $dir = "cache/widget";
     $filename = "cache/widget/category.list.cache";
     $tmp = array();
     $cat = array();
     $list = array();
-    
+
     if (is_dir($dir) === false) {
         mkdir($dir, 0775, true);
     }
-    
+
     if (file_exists($filename)) {
-        $cat = unserialize(file_get_contents($filename));    
+        $cat = unserialize(file_get_contents($filename));
     } else {
         $arr = get_category_info(null);
         foreach ($arr as $a) {
@@ -596,21 +596,21 @@ function category_list($custom = null) {
         $tmp = serialize($cat);
         file_put_contents($filename, print_r($tmp, true));
     }
-    
+
     if(!empty($custom)) {
         return $cat;
     }
-    
+
     echo '<ul>';
-    
+
     foreach ($cat as $k => $v) {
         if (get_categorycount($v['0']) !== 0) {
             echo '<li><a href="' . site_url() . 'category/' . $v['0'] . '">' . $v['1']. '</a></li>';
         }
     }
-    
+
     echo '</ul>';
-    
+
 }
 
 // Return type page.
@@ -619,13 +619,13 @@ function get_type($type, $page, $perpage)
     $posts = get_post_sorted();
 
     $tmp = array();
-    
+
     if (empty($perpage)) {
-        $perpage = 10;    
+        $perpage = 10;
     }
 
     foreach ($posts as $index => $v) {
-    
+
         $filepath = $v['dirname'] . '/' . $v['basename'];
 
         // Extract the date
@@ -637,7 +637,7 @@ function get_type($type, $page, $perpage)
         // Author string
         $str = explode('/', $replaced);
         $tp = $str[count($str) - 2];
-    
+
         if (strtolower($type) === strtolower($tp)) {
             $tmp[] = $v;
         }
@@ -646,7 +646,7 @@ function get_type($type, $page, $perpage)
     if (empty($tmp)) {
         not_found();
     }
-    
+
     $tmp = array_unique($tmp, SORT_REGULAR);
 
     return $tmp = get_posts($tmp, $page, $perpage);
@@ -680,7 +680,7 @@ function get_tag($tag, $page, $perpage, $random)
     if (empty($tmp)) {
         not_found();
     }
-    
+
     $tmp = array_unique($tmp, SORT_REGULAR);
 
     return $tmp = get_posts($tmp, $page, $perpage);
@@ -766,7 +766,7 @@ function get_author($name)
     if (!empty($names)) {
 
         foreach ($names as $index => $v) {
-        
+
             $author = new stdClass;
 
             // Replaced string
@@ -786,7 +786,7 @@ function get_author($name)
 
                 // Extract the title and body
                 $author->name = get_content_tag('t', $content, $author);
-                
+
                 // Get the contents and convert it to HTML
                 $author->about = MarkdownExtra::defaultTransform(remove_html_comments($content));
 
@@ -844,7 +844,7 @@ function get_static_post($static)
 
                 // Extract the title and body
                 $post->title = get_content_tag('t', $content, $static);
-                
+
                 // Get the contents and convert it to HTML
                 $post->body = MarkdownExtra::defaultTransform(remove_html_comments($content));
 
@@ -890,7 +890,7 @@ function get_static_sub_post($static, $sub_static)
 
                 // Extract the title and body
                 $post->title = get_content_tag('t', $content, $sub_static);
-                
+
                 // Get the contents and convert it to HTML
                 $post->body = MarkdownExtra::defaultTransform(remove_html_comments($content));
 
@@ -910,7 +910,7 @@ function get_static_sub_post($static, $sub_static)
 function get_frontpage()
 {
     $front = new stdClass;
-    
+
     $filename = 'content/data/frontpage/frontpage.md';
 
     if (file_exists($filename)) {
@@ -924,7 +924,7 @@ function get_frontpage()
         $front->url = site_url() . 'front';
         $front->body = 'Welcome to our website.';
     }
-    
+
     return $front;
 }
 
@@ -951,8 +951,8 @@ function get_keyword($keyword, $page, $perpage)
         return $tmp;
     }
 
-    return $tmp = get_posts($tmp, $page, $perpage); 
- 
+    return $tmp = get_posts($tmp, $page, $perpage);
+
 }
 
 // Get related posts base on post tag.
@@ -976,7 +976,7 @@ function get_related($tag, $custom = null, $count = null)
             $tmp[] = $post;
         }
     }
-    
+
     if (empty($custom)) {
 
         $total = count($tmp);
@@ -991,15 +991,15 @@ function get_related($tag, $custom = null, $count = null)
                     break;
             }
             echo '</ul>';
-        
+
         } else {
             echo '<ul><li>' . i18n('No_related_post_found') . '</li></ul>';
         }
-    
+
     } else {
         return $tmp;
     }
-    
+
 }
 
 // Return post count. Matching $var and $str provided.
@@ -1028,7 +1028,7 @@ function get_categorycount($var)
     $tmp = array();
 
     foreach ($posts as $index => $v) {
-    
+
          $filepath = $v['dirname'] . '/' . $v['basename'];
 
         // Extract the date
@@ -1056,7 +1056,7 @@ function get_typecount($var)
     $tmp = array();
 
     foreach ($posts as $index => $v) {
-    
+
          $filepath = $v['dirname'] . '/' . $v['basename'];
 
         // Extract the date
@@ -1085,7 +1085,7 @@ function get_draftcount($var)
     $tmp = array();
 
     foreach ($posts as $index => $v) {
-    
+
          $filepath = $v['dirname'] . '/' . $v['basename'];
 
         // Extract the date
@@ -1097,7 +1097,7 @@ function get_draftcount($var)
         // Author string
         $str = explode('/', $replaced);
         $cat = $str[count($str) - 3];
-        
+
         if (stripos($cat, "$var") !== false) {
             $tmp[] = $v;
         }
@@ -1112,7 +1112,7 @@ function get_tagcount($var, $str)
     $posts = get_post_sorted();
 
     $tmp = array();
-    
+
     foreach ($posts as $index => $v) {
         $arr = explode('_', $v[$str]);
         $mtag = explode(',', rtrim($arr[1], ','));
@@ -1159,33 +1159,33 @@ function recent_posts($custom = null, $count = null)
             $count = 5;
         }
     }
-    
+
     $dir = "cache/widget";
     $filename = "cache/widget/recent.cache";
     $tmp = array();
     $posts = array();
-    
+
     if (is_dir($dir) === false) {
         mkdir($dir, 0775, true);
     }
-    
+
     if (file_exists($filename)) {
         $posts = unserialize(file_get_contents($filename));
         if (count($posts) != $count) {
             $posts = get_posts(null, 1, $count);
             $tmp = serialize($posts);
             file_put_contents($filename, print_r($tmp, true));
-        }        
+        }
     } else {
        $posts = get_posts(null, 1, $count);
        $tmp = serialize($posts);
        file_put_contents($filename, print_r($tmp, true));
     }
-    
+
     if (!empty($custom)) {
-        return $posts;        
+        return $posts;
     } else {
-    
+
         echo '<ul>';
         foreach ($posts as $post) {
             echo '<li><a href="' . $post->url . '">' . $post->title . '</a></li>';
@@ -1206,33 +1206,33 @@ function recent_type($type, $custom = null, $count = null)
             $count = 5;
         }
     }
-    
+
     $dir = 'cache/widget';
     $filename = 'cache/widget/recent.' . $type . '.cache';
     $tmp = array();
     $posts = array();
-    
+
     if (is_dir($dir) === false) {
         mkdir($dir, 0775, true);
     }
-    
+
     if (file_exists($filename)) {
         $posts = unserialize(file_get_contents($filename));
         if (count($posts) != $count) {
             $posts = get_type($type, 1, $count);
             $tmp = serialize($posts);
             file_put_contents($filename, print_r($tmp, true));
-        }        
+        }
     } else {
        $posts = get_type($type, 1, $count);
        $tmp = serialize($posts);
        file_put_contents($filename, print_r($tmp, true));
     }
-    
+
     if (!empty($custom)) {
-        return $posts;        
+        return $posts;
     } else {
-    
+
         echo '<ul>';
         foreach ($posts as $post) {
             echo '<li><a href="' . $post->url . '">' . $post->title . '</a></li>';
@@ -1245,7 +1245,7 @@ function recent_type($type, $custom = null, $count = null)
 }
 
 // Return popular posts lists
-function popular_posts($custom = null, $count = null) 
+function popular_posts($custom = null, $count = null)
 {
 
     static $_views = array();
@@ -1257,7 +1257,7 @@ function popular_posts($custom = null, $count = null)
             $count = 5;
         }
     }
-    
+
     if (config('views.counter') == 'true') {
         if (empty($_views)) {
             $filename = 'content/data/views.json';
@@ -1275,7 +1275,7 @@ function popular_posts($custom = null, $count = null)
                             }
                         }
                     }
-                    
+
                     $dir = "cache/widget";
                     $filecache = "cache/widget/popular.cache";
                     $ar = array();
@@ -1314,7 +1314,7 @@ function popular_posts($custom = null, $count = null)
                     } else {
                         return $tmp;
                     }
-                } 
+                }
             } else {
                 if (empty($custom)) {
                     echo '<ul><li>No popular posts found</li></ul>';
@@ -1339,17 +1339,17 @@ function archive_list($custom = null)
     $dir = "cache/widget";
     $filename = "cache/widget/archive.cache";
     $ar = array();
-    
+
     if (is_dir($dir) === false) {
         mkdir($dir, 0775, true);
     }
-        
+
     $posts = get_post_unsorted();
     $by_year = array();
     $col = array();
 
     if (!empty($posts)) {
-        
+
         if (!file_exists($filename)) {
             foreach ($posts as $index => $v) {
 
@@ -1370,17 +1370,17 @@ function archive_list($custom = null)
                 $m = $row['1'];
                 $by_year[$y][] = $m;
             }
-            
+
             $ar = serialize($by_year);
             file_put_contents($filename, print_r($ar, true));
-            
+
         } else {
-            $by_year = unserialize(file_get_contents($filename)); 
+            $by_year = unserialize(file_get_contents($filename));
         }
 
         # Most recent year first
         krsort($by_year);
-        
+
         # Iterate for display
         $i = 0;
         $len = count($by_year);
@@ -1395,11 +1395,11 @@ function archive_list($custom = null)
                     $arrow = '&#9658;';
                 }
                 $i++;
-            
+
                 $by_month = array_count_values($months);
                 # Sort the months
                 krsort($by_month);
-            
+
                 $script = <<<EOF
                     if (this.parentNode.className.indexOf('expanded') > -1){this.parentNode.className = 'collapsed';this.innerHTML = '&#9658;';} else {this.parentNode.className = 'expanded';this.innerHTML = '&#9660;';}
 EOF;
@@ -1433,11 +1433,11 @@ function tag_cloud($custom = null)
     $dir = "cache/widget";
     $filename = "cache/widget/tags.cache";
     $tg = array();
-    
+
     if (is_dir($dir) === false) {
         mkdir($dir, 0775, true);
     }
-    
+
     $posts = get_post_unsorted();
     $tags = array();
 
@@ -1459,7 +1459,7 @@ function tag_cloud($custom = null)
         } else {
             $tag_collection = unserialize(file_get_contents($filename));
         }
-        
+
         if(empty($custom)) {
             echo '<ul class="taglist">';
             foreach ($tag_collection as $tag => $count) {
@@ -1553,59 +1553,59 @@ function has_pagination($total, $perpage, $page = 1)
 
 //function to return the pagination string
 function get_pagination($page = 1, $totalitems, $perpage = 10, $adjacents = 1, $pagestring = '?page=')
-{        
+{
     //defaults
     if(!$adjacents) $adjacents = 1;
     if(!$perpage) $perpage = 10;
     if(!$page) $page = 1;
-    
+
     //other vars
     $prev = $page - 1;                                    //previous page is page - 1
     $next = $page + 1;                                    //next page is page + 1
     $lastpage = ceil($totalitems / $perpage);             //lastpage is = total items / items per page, rounded up.
     $lpm1 = $lastpage - 1;                                //last page minus 1
-    
-    /* 
-        Now we apply our rules and draw the pagination object. 
+
+    /*
+        Now we apply our rules and draw the pagination object.
         We're actually saving the code to a variable in case we want to draw it more than once.
     */
     $pagination = '';
     if($lastpage > 1)
-    {    
+    {
         $pagination .= '<ul class="pagination">';
 
         //previous button
-        if ($page > 1) 
+        if ($page > 1)
             $pagination .= '<li><a href="'. $pagestring . $prev .'">« Prev</a></li>';
         else
-            $pagination .= '<li class="disabled"><span>« Prev</span></li>';    
-        
-        //pages    
+            $pagination .= '<li class="disabled"><span>« Prev</span></li>';
+
+        //pages
         if ($lastpage < 7 + ($adjacents * 2))    //not enough pages to bother breaking it up
-        {    
+        {
             for ($counter = 1; $counter <= $lastpage; $counter++)
             {
                 if ($counter == $page)
                     $pagination .= '<li class="active"><span>'. $counter.'</span></li>';
                 else
-                    $pagination .= '<li><a href="'. $pagestring . $counter .'">'. $counter .'</a></li>';                    
+                    $pagination .= '<li><a href="'. $pagestring . $counter .'">'. $counter .'</a></li>';
             }
         }
         elseif($lastpage >= 7 + ($adjacents * 2))    //enough pages to hide some
         {
             //close to beginning; only hide later pages
-            if($page < 1 + ($adjacents * 3))        
+            if($page < 1 + ($adjacents * 3))
             {
                 for ($counter = 1; $counter < 4 + ($adjacents * 2); $counter++)
                 {
                     if ($counter == $page)
                         $pagination .= '<li class="active"><span>'. $counter .'</span></li>';
                     else
-                        $pagination .= '<li><a href="'. $pagestring . $counter .'">'. $counter .'</a></li>';                    
+                        $pagination .= '<li><a href="'. $pagestring . $counter .'">'. $counter .'</a></li>';
                 }
                 $pagination .= '<li class="disabled"><span>...</span></li>';
                 $pagination .= '<li><a href="'. $pagestring . $lpm1 .'">'. $lpm1 .'</a></li>';
-                $pagination .= '<li><a href="'. $pagestring . $lastpage .'">'. $lastpage .'</a></li>';        
+                $pagination .= '<li><a href="'. $pagestring . $lastpage .'">'. $lastpage .'</a></li>';
             }
             //in middle; hide some front and some back
             elseif($lastpage - ($adjacents * 2) > $page && $page > ($adjacents * 2))
@@ -1618,11 +1618,11 @@ function get_pagination($page = 1, $totalitems, $perpage = 10, $adjacents = 1, $
                     if ($counter == $page)
                         $pagination .= '<li class="active"><span>'. $counter .'</span></li>';
                     else
-                        $pagination .= '<li><a href="'. $pagestring . $counter .'">'. $counter .'</a></li>';                    
+                        $pagination .= '<li><a href="'. $pagestring . $counter .'">'. $counter .'</a></li>';
                 }
                 $pagination .= '<li class="disabled"><span>...</span></li>';
                 $pagination .= '<li><a href="'. $pagestring . $lpm1 .'">'. $lpm1 .'</a></li>';
-                $pagination .= '<li><a href="'. $pagestring . $lastpage . '">'. $lastpage .'</a></li>';        
+                $pagination .= '<li><a href="'. $pagestring . $lastpage . '">'. $lastpage .'</a></li>';
             }
             //close to end; only hide early pages
             else
@@ -1635,19 +1635,19 @@ function get_pagination($page = 1, $totalitems, $perpage = 10, $adjacents = 1, $
                     if ($counter == $page)
                         $pagination .= '<li class="active"><span>'. $counter .'</span></li>';
                     else
-                        $pagination .= '<li><a href="'. $pagestring . $counter .'">'. $counter .'</a></li>';                    
+                        $pagination .= '<li><a href="'. $pagestring . $counter .'">'. $counter .'</a></li>';
                 }
             }
         }
-        
+
         //next button
-        if ($page < $counter - 1) 
+        if ($page < $counter - 1)
             $pagination .= '<li><a href="'. $pagestring . $next .'">Next »</a></li>';
         else
             $pagination .= '<li class="disabled"><span>Next »</span></li>';
         $pagination .= '</ul>';
     }
-    
+
     return $pagination;
 
 }
@@ -1678,16 +1678,16 @@ function get_teaser($string, $url = null, $char = null)
 
     $teaserType = config('teaser.type');
     $more = config('read.more');
-    
+
     if(empty($more)) {
         $more = 'Read more';
     }
-    
+
     if(empty($char)) {
         $char = config('teaser.char');
         if(empty($char)) {
             $char = 200;
-        }        
+        }
     }
 
     if ($teaserType === 'full') {
@@ -1866,6 +1866,7 @@ function disqus($title = null, $url = null)
         var disqus_shortname = '{$disqus}';
         var disqus_title = '{$title}';
         var disqus_url = getAbsolutePath('{$url}');
+        var disqus_url = '{$url}';
         (function () {
             var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
             dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
@@ -1921,7 +1922,7 @@ function facebook()
     <script>(function (d, s, id) {
         var js, fjs = d.getElementsByTagName(s)[0];
         if (d.getElementById(id)) return;
-        js = d.createElement(s); 
+        js = d.createElement(s);
         js.id = id;
         js.src = "//connect.facebook.net/en_US/all.js#xfbml=1&appId={$appid}";
         fjs.parentNode.insertBefore(js, fjs);
@@ -2056,7 +2057,7 @@ function get_menu($custom)
         } else {
             echo '<li class="item first"><a href="' . site_url() . '">' . config('breadcrumb.home') . '</a></li>';
         }
-        
+
         if (config('blog.enable') == 'true' ) {
             if ($req == site_path() . '/blog' || stripos($req, site_path() . '/blog?page') !== false) {
                 echo '<li class="item active"><a href="' . site_url() . 'blog">' . 'Blog' . '</a></li>';
@@ -2090,7 +2091,7 @@ function get_menu($custom)
             } else {
                 $active = '';
             }
-            
+
             $subPages = get_static_sub_pages(str_replace('.md', '', $base));
             if (!empty($subPages)) {
                 asort($subPages);
@@ -2337,7 +2338,7 @@ function generate_sitemap($str)
         if (config('sitemap.priority.static') !== 'false') {
             echo '<sitemap><loc>' . site_url() . 'sitemap.static.xml</loc></sitemap>';
         }
-        
+
         if (config('sitemap.priority.category') !== 'false') {
             echo '<sitemap><loc>' . site_url() . 'sitemap.category.xml</loc></sitemap>';
         }
@@ -2353,7 +2354,7 @@ function generate_sitemap($str)
         if (config('sitemap.priority.author') !== 'false') {
             echo '<sitemap><loc>' . site_url() . 'sitemap.author.xml</loc></sitemap>';
         }
-        
+
         if (config('sitemap.priority.type') !== 'false') {
             echo '<sitemap><loc>' . site_url() . 'sitemap.type.xml</loc></sitemap>';
         }
@@ -2535,13 +2536,13 @@ function generate_sitemap($str)
             foreach ($posts as $index => $v) {
 
                 $arr = explode('_', $v);
-                
+
                 $replaced = substr($arr[0], 0, strrpos($arr[0], '/')) . '/';
 
                 $str = explode('/', $replaced);
-                
+
                 $cats[] = $str[count($str) - 3];
-                
+
             }
 
             foreach ($cats as $c) {
@@ -2577,11 +2578,11 @@ function generate_sitemap($str)
             foreach ($posts as $index => $v) {
 
                 $arr = explode('_', $v);
-                
+
                 $replaced = substr($arr[0], 0, strrpos($arr[0], '/')) . '/';
 
                 $str = explode('/', $replaced);
-                
+
                 $types[] = $str[count($str) - 2];
             }
 
@@ -2726,7 +2727,7 @@ function head_contents()
     $output = '';
     $wmt_id = config('google.wmt.id');
     static $_version = array();
-    
+
     $filename = "cache/installedVersion.json";
     if (file_exists($filename)) {
         $_version = json_decode(file_get_contents($filename), true);
@@ -2742,7 +2743,7 @@ function head_contents()
     $charset = '<meta charset="utf-8" />';
     $generator = '<meta name="generator" content="' . $version . '" />';
     $xua = '<meta http-equiv="X-UA-Compatible" content="IE=edge" />';
-    $viewport = '<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />';
+    $viewport = '<meta name="viewport" content="width=device-width, initial-scale=1" />';
     $sitemap = '<link rel="sitemap" href="' . site_url() . 'sitemap.xml" />';
     $feed = '<link rel="alternate" type="application/rss+xml" title="' . blog_title() . ' Feed" href="' . site_url() . 'feed/rss" />';
     $webmasterTools = '';
@@ -2766,28 +2767,28 @@ function toolbar()
     <link href="{$base}system/resources/css/toolbar.css" rel="stylesheet" />
 EOF;
     echo '<div id="toolbar"><ul>';
-    echo '<li><a href="' . $base . 'admin">' . i18n('Admin') . '</a></li>';
+    echo '<li class="tb-admin"><a href="' . $base . 'admin">' . i18n('Admin') . '</a></li>';
     if ($role === 'admin') {
-        echo '<li><a href="' . $base . 'admin/posts">' . i18n('Posts') . '</a></li>';
+        echo '<li class="tb-posts"><a href="' . $base . 'admin/posts">' . i18n('Posts') . '</a></li>';
         if (config('views.counter') == 'true') {
-            echo '<li><a href="' . $base . 'admin/popular">Popular</a></li>';
+            echo '<li class="tb-popular"><a href="' . $base . 'admin/popular">Popular</a></li>';
         }
     }
-    echo '<li><a href="' . $base . 'admin/mine">' . i18n('Mine') . '</a></li>';
-    echo '<li><a href="' . $base . 'admin/draft">' . i18n('Draft') . '</a></li>';
-    echo '<li><a href="' . $base . 'admin/content">' . i18n('Add_content') . '</a></li>';
+    echo '<li class="tb-mine"><a href="' . $base . 'admin/mine">' . i18n('Mine') . '</a></li>';
+    echo '<li class="tb-draft"><a href="' . $base . 'admin/draft">' . i18n('Draft') . '</a></li>';
+    echo '<li class="tb-addcontent"><a href="' . $base . 'admin/content">' . i18n('Add_content') . '</a></li>';
     if ($role === 'admin') {
-        echo '<li><a href="' . $base . 'admin/categories">' . i18n('Categories') . '</a></li>';
+        echo '<li class="tb-categories"><a href="' . $base . 'admin/categories">' . i18n('Categories') . '</a></li>';
     }
-    echo '<li><a href="' . $base . 'edit/profile">' . i18n('Edit_profile') . '</a></li>';
-    echo '<li><a href="' . $base . 'admin/import">' . i18n('Import') . '</a></li>';
-    echo '<li><a href="' . $base . 'admin/backup">' . i18n('Backup') . '</a></li>';
+    echo '<li class="tb-editprofile"><a href="' . $base . 'edit/profile">' . i18n('Edit_profile') . '</a></li>';
+    echo '<li class="tb-import"><a href="' . $base . 'admin/import">' . i18n('Import') . '</a></li>';
+    echo '<li class="tb-backup"><a href="' . $base . 'admin/backup">' . i18n('Backup') . '</a></li>';
     if ($role === 'admin') {
-      echo '<li><a href="' . $base . 'admin/config">' . i18n('Config') . '</a></li>';
+      echo '<li class="tb-config"><a href="' . $base . 'admin/config">' . i18n('Config') . '</a></li>';
     }
-    echo '<li><a href="' . $base . 'admin/clear-cache">' . i18n('Clear_cache') . '</a></li>';
-    echo '<li><a href="' . $base . 'admin/update">' . i18n('Update') . '</a></li>';
-    echo '<li><a href="' . $base . 'logout">' . i18n('Logout') . '</a></li>';
+    echo '<li class="tb-clearcache"><a href="' . $base . 'admin/clear-cache">' . i18n('Clear_cache') . '</a></li>';
+    echo '<li class="tb-update"><a href="' . $base . 'admin/update">' . i18n('Update') . '</a></li>';
+    echo '<li class="tb-logout"><a href="' . $base . 'logout">' . i18n('Logout') . '</a></li>';
 
     echo '</ul></div>';
 }
@@ -2801,7 +2802,7 @@ function file_cache($request)
     if (empty($hour)) {
         $hour = 6;
     }
-    
+
     $now   = time();
 
     $c = str_replace('/', '#', str_replace('?', '~', $request));
@@ -2894,7 +2895,7 @@ function get_content_tag($tag, $string, $alt = null)
     return $alt;
 }
 
-// Strip html comment 
+// Strip html comment
 function remove_html_comments($content)
 {
     $patterns = array('/(\s|)<!--t(.*)t-->(\s|)/', '/(\s|)<!--d(.*)d-->(\s|)/', '/(\s|)<!--tag(.*)tag-->(\s|)/', '/(\s|)<!--image(.*)image-->(\s|)/', '/(\s|)<!--video(.*)video-->(\s|)/', '/(\s|)<!--audio(.*)audio-->(\s|)/', '/(\s|)<!--link(.*)link-->(\s|)/', '/(\s|)<!--quote(.*)quote-->(\s|)/');
@@ -2942,7 +2943,7 @@ function shorten($string = null, $char = null)
     if(empty($char) || empty($string)) {
         return;
     }
-    
+
     if (strlen(strip_tags($string)) < $char) {
         $string = preg_replace('/\s\s+/', ' ', strip_tags($string));
         $string = ltrim(rtrim($string));
@@ -2954,7 +2955,7 @@ function shorten($string = null, $char = null)
         $string = substr($string, 0, strrpos($string, ' '));
         return $string;
     }
-    
+
 }
 
 // save the i18n tag
@@ -2969,11 +2970,11 @@ function save_tag_i18n($tag,$tagDisplay)
     $tags = array();
     $tmp = array();
     $views = array();
-    
+
     $tt = explode(',', rtrim($tag, ','));
     $tl = explode(',', rtrim($tagDisplay, ','));
     $tags = array_combine($tt,$tl);
-    
+
     if (file_exists($filename)) {
         $views = unserialize(file_get_contents($filename));
         foreach ($tags as $key => $val) {
@@ -3032,7 +3033,7 @@ function safe_tag($string)
     $string = implode(',', $tags);
     $string = preg_replace('/[\s_]/', '-', $string);
     return $string;
-    
+
 }
 
 // rename category folder
@@ -3043,11 +3044,11 @@ function rename_category_folder($string, $old_url)
     $url = substr($old, 0, strrpos($old, '/'));
     $ostr = explode('/', $url);
     $url = '/blog/' . $ostr[count($ostr) - 1];
-    
+
     $dir = get_category_folder();
-    
+
     $file = array();
-   
+
     foreach ($dir as $index => $v) {
         if (stripos($v, $url) !== false) {
             $str = explode('/', $v);
@@ -3055,13 +3056,13 @@ function rename_category_folder($string, $old_url)
             $file[] = array($v, $n);
         }
     }
-    
+
     foreach ($file as $f) {
         if(is_dir($f[0])) {
             rename($f[0], $f[1]);
         }
     }
-    
+
 }
 
 // Migrate old content.
@@ -3073,16 +3074,16 @@ function migrate_old_content()
     $draft = array();
     $dtmp = array();
     $dfiles = array();
-    
+
     $tmp = glob('content/*/blog/*.md', GLOB_NOSORT);
     if (is_array($tmp)) {
         foreach ($tmp as $file) {
             $content[] = $file;
         }
     }
-    
+
     if(!empty($content)) {
-    
+
         foreach ($content as $c => $v) {
             $arr = explode('/', $v);
             $string = file_get_contents($v);
@@ -3134,23 +3135,23 @@ function migrate_old_content()
                 }
             }
         }
-        
+
         foreach ($files as $f) {
             rename($f[0], $f[1]);
         }
-    
+
     }
-    
+
     $dir = 'content/data/';
     if (!is_dir($dir)) {
         mkdir($dir, 0775, true);
     }
-    
+
     if (file_exists('content/tags.lang')) {
         rename('content/tags.lang', 'content/data/tags.lang');
         unlink('content/views.json');
     }
-    
+
     $dtmp = glob('content/*/draft/*.md', GLOB_NOSORT);
     $old = array();
     if (is_array($dtmp)) {
@@ -3158,7 +3159,7 @@ function migrate_old_content()
             $draft[] = $dfile;
         }
     }
-    
+
     if(!empty($draft)) {
         foreach ($draft as $d => $val) {
             $arr = explode('/', $val);
@@ -3170,19 +3171,19 @@ function migrate_old_content()
             }
             $dfiles[] = array($val, $new);
         }
-    
-        foreach ($dfiles as $fd) {    
+
+        foreach ($dfiles as $fd) {
             rename($fd[0], $fd[1]);
         }
         $tt = array();
         $tt = array_unique($old, SORT_REGULAR);
-        foreach ($tt as $t) {    
+        foreach ($tt as $t) {
             rmdir($t);
         }
     }
-    
+
     rebuilt_cache('all');
- 
+
 }
 
 function replace_href($string, $tag, $class, $url)
@@ -3202,22 +3203,24 @@ function replace_href($string, $tag, $class, $url)
             $new = $_tag->setAttribute('href', $url . utf8_decode($old));
         }
     }
-    
+
     return preg_replace('~<(?:!DOCTYPE|/?(?:html|head|body))[^>]*>\s*~i', '', utf8_decode($doc->saveHTML($doc->documentElement)));
 
 }
 
-function get_language() 
+function get_language()
 {
-	
+
     $langID = config('language');
     $langFile = 'lang/'. $langID . '.ini';
+    $local = $langID;
 
     // Settings for the language
     if (!isset($langID) || config('language') === 'en' || !file_exists($langFile)) {
+    if (!isset($langID) || config('language') === 'en') {
         i18n('source', 'lang/en.ini'); // Load the English language file
         setlocale(LC_ALL, 'en_US', 'en_US.utf8', 'English'); // Change locale to English
-    } else {	
+    } else {
         i18n('source', $langFile);
 
         // Locales are known under different names on different systems; I don't know any other way
@@ -3229,20 +3232,21 @@ function get_language()
             setlocale(LC_ALL,  'sv_SE', 'sv_SE.utf8', 'Swedish');
         }
         elseif ($langID === 'pl') {
-            setlocale(LC_ALL,  'pl_PL', 'pl_PL.utf8', 'Polish');   
+            setlocale(LC_ALL,  'pl_PL', 'pl_PL.utf8', 'Polish');
         }
     }
+
 }
 
 function format_date($date)
 {
 
     $date_format = config('date.format');
-    
+
     if (!isset($date_format) || empty($date_format)) {
         return strftime('%e %B %Y', $date);
     } else {
-        return strftime($date_format, $date);	
+        return strftime($date_format, $date);
     }
 
 }
diff --git a/system/resources/css/toolbar.css b/system/resources/css/toolbar.css
index fc08715..a2c43bb 100644
--- a/system/resources/css/toolbar.css
+++ b/system/resources/css/toolbar.css
@@ -2,6 +2,22 @@ body {
     padding-top: 30px
 }
 
+.admin-front .tb-admin,
+.all-posts .tb-posts,
+.admin-popular .tb-popular,
+.admin-mine .tb-mine,
+.admin-draft .tb-draft,
+.admin-content .tb-addcontent,
+.admin-categories .tb-categories,
+.edit-profile .tb-editprofile,
+.admin-import .tb-import,
+.admin-backup .tb-backup,
+.admin-config .tb-config,
+.admin-clear-cache .tb-clearcache,
+.admin-update .tb-update {
+    background:#400;
+}
+
 #toolbar {
     background: #666;
     box-shadow: 0 5px 15px #000;
@@ -23,16 +39,16 @@ body {
 
 #toolbar ul {
     margin: 0;
-    padding-top: 5px;
-    padding-bottom: 5px;
+    padding: 0;
     padding-left: 30px;
-    float: left
 }
 
 #toolbar ul li, #toolbar ul li a {
-    float: left;
+    display:inline-block;
     list-style: none;
-    margin: 0
+    margin: 0;
+    height: 30px;
+    line-height: 30px;
 }
 
 #toolbar a {
@@ -41,7 +57,6 @@ body {
     text-decoration: none;
     border-radius: 10px;
     padding: 0 10px;
-    line-height: 1.6
 }
 
 @media all and (max-width: 550px) {