diff --git a/system/includes/functions.php b/system/includes/functions.php
index a58dc1a..b088f14 100644
--- a/system/includes/functions.php
+++ b/system/includes/functions.php
@@ -1032,7 +1032,7 @@ function tab($p)
             echo '<div class="tab"><ul class="nav nav-tabs"><li role="presentation" class="active"><a href="' . $p->url . '">View</a></li><li><a href="' . $p->url . '/edit?destination=post">Edit</a></li></ul></div>';
         }
     } else {
-        echo '<div class="tab"><ul class="nav nav-tabs"><li role="presentation" class="active"><a href="' . $p->url . '">View</a><a href="' . $p->url . '/edit?destination=post">Edit</a></li></ul></div>';
+        echo '<div class="tab"><ul class="nav nav-tabs"><li role="presentation" class="active"><a href="' . $p->url . '">View</a></li><li><a href="' . $p->url . '/edit?destination=post">Edit</a></li></ul></div>';
     }
 }
 
diff --git a/themes/blog/layout.html.php b/themes/blog/layout.html.php
index 9253c14..2266162 100644
--- a/themes/blog/layout.html.php
+++ b/themes/blog/layout.html.php
@@ -102,13 +102,13 @@
                     <div class="section-inner">
                         <h2 class="heading">Latest Blog Posts</h2>
                         <?php $lists = recent_posts(true);?>
-                        <?php $i = 1; $lt = 60;?>
+                        <?php $char = 60;?>
                         <?php foreach ($lists as $l):?>
-                        <?php if (strlen(strip_tags($l->title)) > $lt) { $lbp = shorten($l->title, $lt) . '...';} else {$lbp = $l->title;}?>
+                        <?php if (strlen(strip_tags($l->title)) > $char) { $recentTitle = shorten($l->title, $char) . '...';} else {$recentTitle = $l->title;}?>
                         <div class="item">
-                            <h3 class="title"><a href="<?php echo $l->url;?>"><?php echo $lbp;?></a></h3>
+                            <h3 class="title"><a href="<?php echo $l->url;?>"><?php echo $recentTitle;?></a></h3>
                             <div class="content">
-                                <p><?php echo get_teaser($l->body, 75); ?>...</p>
+                                <p><?php echo shorten($l->body, 75); ?>...</p>
                                 <a class="more-link" href="<?php echo $l->url;?>"><i class="fa fa-link"></i> Read more</a>
                             </div><!--//content-->
                         </div>
diff --git a/themes/blog/main.html.php b/themes/blog/main.html.php
index 150abf0..1a7faf3 100644
--- a/themes/blog/main.html.php
+++ b/themes/blog/main.html.php
@@ -65,6 +65,7 @@
                         <a href="https://twitter.com/share?url=<?php echo $p->url ?>&text=<?php echo $p->title ?>"><i class="fa fa-twitter"></i></a> 
                         <a class="last" href="https://plus.google.com/share?url=<?php echo $p->url ?>"><i class="fa fa-google-plus"></i></a> 
                     </span>
+                <div style="clear:both;"></div>
                 </div>
             </div><!--//item-->                       
         </div><!--//content-->  
diff --git a/themes/blog/post.html.php b/themes/blog/post.html.php
index 28ab344..f37c02e 100644
--- a/themes/blog/post.html.php
+++ b/themes/blog/post.html.php
@@ -72,16 +72,16 @@
                     <?php echo disqus_count() ?>
                 <?php endif; ?>
                 <?php $tags = get_related($p->tag, true, config('related.count'));?>
-                <?php  $mt = 30; $total = count($tags); $i = 1; if ($total >= 1) { ?>
+                <?php $char = 30; $total = count($tags); $i = 1; if ($total >= 1) { ?>
                     <div class="related related-posts" style="margin-top:30px;position:relative;">
                         <hr>
                         <h2 class="heading">Related Posts</h2>
                         <?php foreach ($tags as $t):?>
                             <div class="item col-md-4">
-                                <?php if (strlen(strip_tags($t->title)) > $mt) { $rt = shorten($t->title, $mt) . '...';} else {$rt = $t->title;}?>
-                                <h3 class="title"><a href="<?php echo $t->url;?>"><?php echo $rt;?></a></h3>
+                                <?php if (strlen(strip_tags($t->title)) > $char) { $relatedTitle = shorten($t->title, $char) . '...';} else {$relatedTitle = $t->title;}?>
+                                <h3 class="title"><a href="<?php echo $t->url;?>"><?php echo $relatedTitle;?></a></h3>
                                 <div class="content">
-                                    <p><?php echo get_teaser($t->body, 60); ?>... <a class="more-link" href="<?php echo $t->url;?>">more</a></p>
+                                    <p><?php echo shorten($t->body, 60); ?>... <a class="more-link" href="<?php echo $t->url;?>">more</a></p>
                                 </div><!--//content-->
                             </div>
                             <?php if ($i++ >= config('related.count')) break; ?>
diff --git a/themes/blog/static.html.php b/themes/blog/static.html.php
index ef3a784..48b3baf 100644
--- a/themes/blog/static.html.php
+++ b/themes/blog/static.html.php
@@ -1,6 +1,7 @@
 <section class="post section" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
     <div class="section-inner">
         <div class="content">
+            <?php if (login()) { echo tab($p); } ?>
             <div class="item">
                 <h2 class="title" itemprop="headline"><a href="<?php echo $p->url;?>"><?php echo $p->title;?></a></h2>
                 <div class="desc text-left" itemprop="articleBody">