diff --git a/public/themes/default/header.chunk.php b/public/themes/default/header.chunk.php
index 37f259a..3789597 100644
--- a/public/themes/default/header.chunk.php
+++ b/public/themes/default/header.chunk.php
@@ -72,10 +72,20 @@
     </div>
 
     <div class="page-header container text-center">
-      <?php if (Uri::segment(0) == 'users') { ?>
+      <?php if (Uri::segment(0) == 'users'  && Uri::segment(1) == '') { ?>
         <h1><?php echo __('Users', 'users'); ?></h1>
       <?php } elseif (Uri::segment(0) == 'sitemap') { ?>
         <h1><?php echo __('Sitemap', 'sitemap'); ?></h1>
+      <?php } elseif (Uri::segment(0) == 'users' && Uri::segment(1) == 'registration') { ?>        
+        <h1><?php echo __('Registration', 'users'); ?></h1>
+      <?php } elseif (Uri::segment(0) == 'users' && Uri::segment(1) == 'login') { ?>
+        <h1><?php echo __('Sign In', 'users'); ?></h1>
+      <?php } elseif (Uri::segment(0) == 'users' && Uri::segment(1) == 'password-reset') { ?>                
+        <h1><?php echo __('Reset Password', 'users') ?></h1>
+      <?php } elseif (Uri::segment(0) == 'users' && Uri::segment(2) == 'edit') { ?>                
+        <h1><?php echo __('Edit profile', 'users') ?></h1>
+      <?php } elseif (Uri::segment(0) == 'users' && Uri::segment(1) ) { ?>
+        <h1><?php echo __('Profile', 'users'); ?></h1>
       <?php } else { ?>
         <h1><?php echo Page::title(); ?></h1>
       <?php } ?>
diff --git a/public/themes/default/index.template.php b/public/themes/default/index.template.php
index bb46b4a..44acdde 100644
--- a/public/themes/default/index.template.php
+++ b/public/themes/default/index.template.php
@@ -1,27 +1,27 @@
 <?php Chunk::get('header'); ?>
-    <div class="container-wide">
+<div class="container-wide">
 
-        <div class="container">
+    <div class="container">
 
-            <div class="row">
-                <div class="col-xs-12">
-                    <?php Action::run('theme_pre_content'); ?>
-                </div>
+        <div class="row">
+            <div class="col-xs-12">
+                <?php Action::run('theme_pre_content'); ?>
             </div>
-
-            <div class="row">
-                <div class="col-xs-12">
-                    <?php echo Site::content(); ?>
-                </div>
-            </div>
-
-            <div class="row">
-                <div class="col-xs-12">
-                    <?php Action::run('theme_post_content'); ?>
-                </div>
-            </div>
-
         </div>
-        
+
+        <div class="row">
+            <div class="col-xs-12">
+                <?php echo Site::content(); ?>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-xs-12">
+                <?php Action::run('theme_post_content'); ?>
+            </div>
+        </div>
+
     </div>
+    
+</div>
 <?php Chunk::get('footer'); ?>