diff --git a/plugins/box/sitemap/views/frontend/index.view.php b/plugins/box/sitemap/views/frontend/index.view.php
index b4e6eab..5cf4c81 100644
--- a/plugins/box/sitemap/views/frontend/index.view.php
+++ b/plugins/box/sitemap/views/frontend/index.view.php
@@ -1,5 +1,4 @@
-<h3><?php echo __('Sitemap', 'sitemap'); ?></h3>
-<hr>
+
 <ul>
 <?php
 
diff --git a/plugins/box/users/views/frontend/edit.view.php b/plugins/box/users/views/frontend/edit.view.php
index d14d747..386d7bc 100644
--- a/plugins/box/users/views/frontend/edit.view.php
+++ b/plugins/box/users/views/frontend/edit.view.php
@@ -1,6 +1,3 @@
-<h3><?php echo __('Edit profile', 'users') ?></h3>
-<hr>
-
 <div class="row">
 	<div class="col-md-3">
 
@@ -48,6 +45,7 @@
 		</div>
 		<div class="form-group">
 		<input type="submit" class="btn btn-primary" value="<?php echo __('Save', 'users'); ?>" name="edit_profile">
+		<?php echo Html::anchor(__('Cancel', 'users'), Site::url().'/users/'.Uri::segment(1), array('title' => __('Cancel', 'pages'), 'class' => 'btn btn-default')); ?>
 		</div>
 		</form>
 	</div>
diff --git a/plugins/box/users/views/frontend/index.view.php b/plugins/box/users/views/frontend/index.view.php
index 136bd2a..fce726c 100644
--- a/plugins/box/users/views/frontend/index.view.php
+++ b/plugins/box/users/views/frontend/index.view.php
@@ -1,5 +1,3 @@
-<h3><?php echo __('Users', 'users'); ?></h3>
-<hr>
 <table>
     <tr>
         <td></td>
@@ -11,4 +9,4 @@
         </td>
     </tr>
     <?php } ?>
-</table>
+</table>
\ No newline at end of file
diff --git a/plugins/box/users/views/frontend/login.view.php b/plugins/box/users/views/frontend/login.view.php
index 8840ef9..095d17d 100644
--- a/plugins/box/users/views/frontend/login.view.php
+++ b/plugins/box/users/views/frontend/login.view.php
@@ -1,6 +1,3 @@
-<h3><?php echo __('Log In', 'users'); ?></h3>
-<hr>
-
 <div class="row">
 	<div class="col-md-3">
 		<form method="post">
diff --git a/plugins/box/users/views/frontend/password_reset.view.php b/plugins/box/users/views/frontend/password_reset.view.php
index c0c0f82..1a663ab 100644
--- a/plugins/box/users/views/frontend/password_reset.view.php
+++ b/plugins/box/users/views/frontend/password_reset.view.php
@@ -1,6 +1,3 @@
-<h3><?php echo __('Reset Password', 'users') ?></h3>
-<hr>
-
 <div class="row">
 	<div class="col-md-3">
 		<form method="post">
diff --git a/plugins/box/users/views/frontend/profile.view.php b/plugins/box/users/views/frontend/profile.view.php
index f92e19c..200ba13 100644
--- a/plugins/box/users/views/frontend/profile.view.php
+++ b/plugins/box/users/views/frontend/profile.view.php
@@ -1,5 +1,3 @@
-<h3><?php echo __('Profile', 'users'); ?></h3>
-<hr>
 <?php if ($user) { ?>
 <table>
 <tr><td><b><?php echo __('Username', 'users'); ?></b>:</td><td><?php echo $user['login']; ?></td></tr>
@@ -11,8 +9,8 @@
 <?php if ($user['twitter'] !== '') { ?><tr><td><b><?php echo __('Twitter', 'users'); ?></b>:</td><td><?php echo Html::toText($user['twitter']); ?></td></tr><?php } ?>
 <?php if ($user['about_me'] !== '') { ?><tr><td><b><?php echo __('About Me', 'users'); ?></b>:</td><td><?php echo Filter::apply('content', Html::toText($user['about_me'])); ?></td></tr><?php } ?>
 </table>
-<br>
 <?php if (Users::isLoged()) { ?>
+<br>
 <a href="<?php echo Site::url(); ?>/users/<?php echo $user['id']; ?>/edit"><?php echo __('Edit profile', 'users'); ?></a> /
 <?php if (in_array(Session::get('user_role'), array('admin', 'editor'))) { ?> <a href="<?php echo Site::url(); ?>/admin"><?php echo __('Administration', 'system'); ?></a> / <?php } ?>
 <a href="<?php echo Site::url(); ?>/users/logout"><?php echo __('Log Out', 'users'); ?></a>
diff --git a/plugins/box/users/views/frontend/registration.view.php b/plugins/box/users/views/frontend/registration.view.php
index a1f82c4..9e4727e 100644
--- a/plugins/box/users/views/frontend/registration.view.php
+++ b/plugins/box/users/views/frontend/registration.view.php
@@ -1,5 +1,3 @@
-<h3><?php echo __('Registration', 'users'); ?></h3>
-<hr>
 <div class="row">
 	<div class="col-md-3">
 		<form method="post">