diff --git a/system/admin/views/add-content.html.php b/system/admin/views/add-content.html.php
index d44ac63..5a2bbfd 100644
--- a/system/admin/views/add-content.html.php
+++ b/system/admin/views/add-content.html.php
@@ -97,7 +97,7 @@ $( function() {
 						<?php endforeach;?>
 					</select>
 					<br>
-					<label for="pTag">Tag <span class="required">*</span></label>
+					<label for="pTag"><?php echo i18n('Tags');?> <span class="required">*</span></label>
 					<input type="text" class="form-control text <?php if (isset($postTag)) { if (empty($postTag)) { echo 'error';}} ?>" id="pTag" name="tag" value="<?php if (isset($postTag)) { echo $postTag; } ?>" placeholder="<?php echo i18n('Comma_separated_values');?>"/>
 					<br>
 					<label for="pMeta"><?php echo i18n('Meta_description');?> (<?php echo i18n('optional');?>)</label>
@@ -118,7 +118,7 @@ $( function() {
 						<small style="margin-top:10px;"><em><?php echo i18n('Scheduled_tips');?></em></small>
 					</div>				
 					<br>
-					<label for="pURL">Url (<?php echo i18n('optional');?>)</label>
+					<label for="pURL"><?php echo i18n('Slug');?> (<?php echo i18n('optional');?>)</label>
 					<input type="text" class="form-control text" id="pURL" name="url" value="<?php if (isset($postUrl)) { echo $postUrl;} ?>" placeholder="<?php echo i18n('If_the_url_leave_empty_we_will_use_the_post_title');?>"/>
 					<br>
 					
diff --git a/system/admin/views/add-page.html.php b/system/admin/views/add-page.html.php
index 61d8b0d..8adebaa 100644
--- a/system/admin/views/add-page.html.php
+++ b/system/admin/views/add-page.html.php
@@ -26,7 +26,7 @@
 				</div>
 				<div class="col-sm-6">
 					<?php if ($type == 'is_page') :?>
-					<label for="pURL">Url (<?php echo i18n('optional');?>)</label>
+					<label for="pURL"><?php echo i18n('Slug');?> (<?php echo i18n('optional');?>)</label>
 					<input type="text" class="form-control text" id="pURL" name="url" value="<?php if (isset($postUrl)) {echo $postUrl;} ?>" placeholder="<?php echo i18n('If_the_url_leave_empty_we_will_use_the_page_title');?>"/>
 					<br>
 					<?php endif;?>
diff --git a/system/admin/views/categories.html.php b/system/admin/views/categories.html.php
index 0ef8b20..71437c9 100644
--- a/system/admin/views/categories.html.php
+++ b/system/admin/views/categories.html.php
@@ -14,14 +14,14 @@
     <tr>
         <td><a href="<?php echo site_url();?>admin/categories/uncategorized"><?php echo i18n("Uncategorized");?></a></td>
         <td><p><?php echo i18n('Uncategorized_comment');?>.</p></td>
-        <td><?php $total = get_draftcount('uncategorized') + get_categorycount('uncategorized'); echo $total?></td>
+        <td><?php $total = get_draftcount('uncategorized') + get_categorycount('uncategorized') + get_scheduledcount('uncategorized'); echo $total?></td>
         <td></td>
     </tr>
     <?php foreach ($desc as $d):?>
     <tr>
         <td><a href="<?php echo site_url();?>admin/categories/<?php echo $d->md;?>"><?php echo $d->title;?></a></td>
         <td><?php echo $d->body;?></td>
-        <td><?php $total = get_draftcount($d->md) + get_categorycount($d->md); echo $total?></td>
+        <td><?php $total = get_draftcount($d->md) + get_categorycount($d->md) + get_scheduledcount($d->md); echo $total?></td>
         <td><a class="btn btn-primary btn-xs" href="<?php echo $d->url;?>/edit?destination=admin/categories"><?php echo i18n('Edit');?></a> <?php if (get_categorycount($d->md) == 0 && get_draftcount($d->md) == 0 ){echo '<a class="btn btn-danger btn-xs" href="' . $d->url . '/delete?destination=admin/categories">' . i18n('Delete') . '</a>';}?></td>
     </tr>
     <?php endforeach;?>
diff --git a/system/admin/views/edit-content.html.php b/system/admin/views/edit-content.html.php
index c518ac7..f5f8a15 100644
--- a/system/admin/views/edit-content.html.php
+++ b/system/admin/views/edit-content.html.php
@@ -146,7 +146,7 @@ $( function() {
 						<?php endforeach;?>
 					</select>
 					<br>
-					<label for="pTag">Tag <span class="required">*</span></label>
+					<label for="pTag"><?php echo i18n('Tags');?> <span class="required">*</span></label>
 					<input type="text" id="pTag" name="tag" class="form-control text <?php if (isset($postTag)) { if (empty($postTag)) { echo 'error'; } } ?>" value="<?php echo $oldtag ?>" placeholder="<?php echo i18n('Comma_separated_values');?>"/>
 					<br>
 
@@ -168,7 +168,7 @@ $( function() {
 						<small style="margin-top:10px;"><em><?php echo i18n('Scheduled_tips');?></em></small>
 					</div>				
 					<br>
-					<label for="pURL">Url  (<?php echo i18n('optional');?>)</label>
+					<label for="pURL"><?php echo i18n('Slug');?>  (<?php echo i18n('optional');?>)</label>
 					<input type="text" id="pURL" name="url" class="form-control text" value="<?php echo $oldmd ?>" placeholder="<?php echo i18n('If_the_url_leave_empty_we_will_use_the_post_title');?>"//>
 					<br>
 
diff --git a/system/admin/views/edit-page.html.php b/system/admin/views/edit-page.html.php
index c990d97..9140724 100644
--- a/system/admin/views/edit-page.html.php
+++ b/system/admin/views/edit-page.html.php
@@ -86,7 +86,7 @@ if ($type == 'is_frontpage') {
 					<input type="text" id="pTitle" name="title" class="form-control text <?php if (isset($postTitle)) { if (empty($postTitle)) { echo 'error'; } } ?>" value="<?php echo $oldtitle ?>"/>
 					<br>
 					<?php if($type != 'is_frontpage' && $type != 'is_profile') { ?>
-					<label for="pMeta"><?php echo i18n('Meta_description');?> (optional)</label>
+					<label for="pMeta"><?php echo i18n('Meta_description');?> <?php echo i18n('optional');?></label>
 					<br />
 					<textarea id="pMeta" class="form-control" name="description" rows="3" cols="20" placeholder="<?php echo i18n('If_leave_empty_we_will_excerpt_it_from_the_content_below');?>"><?php if (isset($p->description)) { echo $p->description;} else {echo $olddescription;}?></textarea>
 					<br /><br />
@@ -94,7 +94,7 @@ if ($type == 'is_frontpage') {
 				</div>
 				<div class="col-sm-6">
 					<?php if($type != 'is_frontpage' && $type != 'is_profile') { ?>
-					<label for="pURL">Url (<?php echo i18n('optional');?>)</label>
+					<label for="pURL"><?php echo i18n('Slug');?> (<?php echo i18n('optional');?>)</label>
 					<br>
 					<input type="text" id="pURL" name="url" class="form-control text" value="<?php echo $oldmd ?>" placeholder="<?php echo i18n('If_the_url_leave_empty_we_will_use_the_page_title');?>"/>
 					<br>