diff --git a/admin/controllers/edit-post.php b/admin/controllers/edit-post.php
index 3c9b453b..f5cdffd6 100644
--- a/admin/controllers/edit-post.php
+++ b/admin/controllers/edit-post.php
@@ -20,7 +20,7 @@ function editPost($args)
 	if( $dbPosts->edit($args) )
 	{
 		Alert::set('The post has been saved successfull');
-		Redirect::page('admin', 'manage-posts');
+		Redirect::page('admin', 'edit-post/'.$args['key']);
 	}
 	else
 	{
diff --git a/admin/views/edit-page.php b/admin/views/edit-page.php
index a760c7a9..1b6d1b46 100644
--- a/admin/views/edit-page.php
+++ b/admin/views/edit-page.php
@@ -1,6 +1,6 @@
 <h2 class="title"><i class="fa fa-pencil"></i> <?php $Language->p('Edit page') ?></h2>
 
-<form method="post" action="" class="forms">
+<form id="jsform" method="post" action="" class="forms">
 
     <input type="hidden" id="jskey" name="key" value="<?php echo $_Page->key() ?>">
 
@@ -20,7 +20,7 @@
     }
     else
     {
-        echo '<p class="advOptions">'.$Language->p('Enable more features at').'<a href="'.HTML_PATH_ADMIN_ROOT.'settings#advanced">'.$Language->p('settings-advanced-writting-settings').'</a></p>';
+        echo '<p class="advOptions">'.$Language->g('Enable more features at').' <a href="'.HTML_PATH_ADMIN_ROOT.'settings#advanced">'.$Language->g('settings-advanced-writting-settings').'</a></p>';
         echo '<div id="jsadvancedOptions" style="display:none">';
     }
 ?>
@@ -78,12 +78,12 @@
 
     </div>
 
-    <button class="btn btn-blue" name="publish"><i class="fa fa-sun-o fa-right"></i><?php $Language->p('Save') ?></button>
+    <button class="btn btn-blue" name="publish"><i class="fa fa-sun-o fa-right"></i><?php echo ($_Page->published()?$Language->p('Save'):$Language->p('Publish now')) ?></button>
 
-    <?php if(count($_Page->children())===0) { ?>
+<?php if(count($_Page->children())===0) { ?>
     <button class="btn" name="draft"><i class="fa fa-circle-o fa-right"></i><?php $Language->p('Draft') ?></button>
-    <button class="btn" name="delete"><i class="fa fa-remove fa-right"></i><?php $Language->p('Delete') ?></button>
-    <?php } ?>
+    <button id="jsdelete" class="btn" name="delete"><i class="fa fa-remove fa-right"></i><?php $Language->p('Delete') ?></button>
+<?php } ?>
 
 </form>
 
@@ -121,6 +121,12 @@ $(document).ready(function()
         checkSlugPage(text, parent, key, $("#jsslug"));
     });
 
+    $("#jsdelete").click(function() {
+        if(!confirm("<?php $Language->p('confirm-delete-this-action-cannot-be-undone') ?>")) {
+            event.preventDefault();
+        }
+    });
+
 });
 
 </script>
\ No newline at end of file
diff --git a/admin/views/edit-post.php b/admin/views/edit-post.php
index 3af9d7f4..83b80b26 100644
--- a/admin/views/edit-post.php
+++ b/admin/views/edit-post.php
@@ -20,7 +20,7 @@
     }
     else
     {
-        echo '<p class="advOptions">'.$Language->p('Enable more features at').'<a href="'.HTML_PATH_ADMIN_ROOT.'settings#advanced">'.$Language->p('settings-advanced-writting-settings').'</a></p>';
+        echo '<p class="advOptions">'.$Language->g('Enable more features at').' <a href="'.HTML_PATH_ADMIN_ROOT.'settings#advanced">'.$Language->g('settings-advanced-writting-settings').'</a></p>';
         echo '<div id="jsadvancedOptions" style="display:none">';
     }
 ?>
@@ -49,9 +49,9 @@
     </label>
     </div>
 
-    <button class="btn btn-blue" name="publish"><i class="fa fa-sun-o fa-right"></i><?php $Language->p('Save') ?></button>
+    <button class="btn btn-blue" name="publish"><i class="fa fa-sun-o fa-right"></i><?php echo ($_Post->published()?$Language->p('Save'):$Language->p('Publish now')) ?></button>
     <button class="btn" name="draft"><i class="fa fa-circle-o fa-right"></i><?php $Language->p('Draft') ?></button>
-    <button class="btn" name="delete"><i class="fa fa-remove fa-right"></i><?php $Language->p('Delete') ?></button>
+    <button id="jsdelete" class="btn" name="delete"><i class="fa fa-remove fa-right"></i><?php $Language->p('Delete') ?></button>
 
 </form>
 
@@ -73,6 +73,12 @@ $(document).ready(function()
         checkSlugPost(slug, key, $("#jsslug"));
     });
 
+    $("#jsdelete").click(function() {
+        if(!confirm("<?php $Language->p('confirm-delete-this-action-cannot-be-undone') ?>")) {
+            event.preventDefault();
+        }
+    });
+
 });
 
 </script>
\ No newline at end of file
diff --git a/admin/views/new-page.php b/admin/views/new-page.php
index 32f4eb0c..ab05b513 100644
--- a/admin/views/new-page.php
+++ b/admin/views/new-page.php
@@ -18,7 +18,7 @@
     }
     else
     {
-        echo '<p class="advOptions">'.$Language->g('Enable more features at').'<a href="'.HTML_PATH_ADMIN_ROOT.'settings#advanced">'.$Language->g('settings-advanced-writting-settings').'</a></p>';
+        echo '<p class="advOptions">'.$Language->g('Enable more features at').' <a href="'.HTML_PATH_ADMIN_ROOT.'settings#advanced">'.$Language->g('settings-advanced-writting-settings').'</a></p>';
         echo '<div id="jsadvancedOptions" style="display:none">';
     }
 ?>
diff --git a/admin/views/new-post.php b/admin/views/new-post.php
index 1affbed5..82b2b1d4 100644
--- a/admin/views/new-post.php
+++ b/admin/views/new-post.php
@@ -18,7 +18,7 @@
     }
     else
     {
-        echo '<p class="advOptions">'.$Language->g('Enable more features at').'<a href="'.HTML_PATH_ADMIN_ROOT.'settings#advanced">'.$Language->g('settings-advanced-writting-settings').'</a></p>';
+        echo '<p class="advOptions">'.$Language->g('Enable more features at').' <a href="'.HTML_PATH_ADMIN_ROOT.'settings#advanced">'.$Language->g('settings-advanced-writting-settings').'</a></p>';
         echo '<div id="jsadvancedOptions" style="display:none">';
     }
 ?>
diff --git a/features.txt b/features.txt
index 36f8da9c..071e5d02 100644
--- a/features.txt
+++ b/features.txt
@@ -42,6 +42,11 @@ Editar usuario
 1- Usuario logueado
 2- Ver si el usuario es administrador o si es el mismo usuario que se esta editando.
 
+—————————
+New post->Publish->Manage posts
+New page->Publish->Manage pages
+Edit page->Save->Edit page
+Edit post->Save->Edit post
 —————————
 
 - Friendly URL son Case sensitive.
diff --git a/languages/en_US.json b/languages/en_US.json
index 0183dd21..ecbcd10c 100644
--- a/languages/en_US.json
+++ b/languages/en_US.json
@@ -48,6 +48,7 @@
     "dasbhoard": "Dasbhoard",
     "manage": "Manage",
     "themes": "Themes",
+    "confirm-delete-this-action-cannot-be-undone": "Confirm delete, this action cannot be undone.",
     "site-title": "Site title",
     "site-slogan": "Site slogan",
     "site-description": "Site description",
diff --git a/plugins/opengaph/language/en_US.json b/plugins/opengraph/language/en_US.json
similarity index 100%
rename from plugins/opengaph/language/en_US.json
rename to plugins/opengraph/language/en_US.json
diff --git a/plugins/opengaph/plugin.php b/plugins/opengraph/plugin.php
similarity index 100%
rename from plugins/opengaph/plugin.php
rename to plugins/opengraph/plugin.php