diff --git a/css/style.css b/css/style.css
index a6dd0dd5..decb071d 100644
--- a/css/style.css
+++ b/css/style.css
@@ -44,3 +44,19 @@ html, body {
 body .form-control {
     padding: 6px;
 }
+
+.view-title {
+    text-align: center;
+    max-width: 240px;
+    font-size: 25px;
+    /*font-weight: bold;*/
+    margin: -41px auto 0 auto;
+}
+
+body .page-header {
+    margin-top: 5px;
+}
+
+div.br {
+    height: 30px;
+}
diff --git a/views/user_edit.ms b/views/user_edit.ms
index 7b465009..dc0f92f8 100644
--- a/views/user_edit.ms
+++ b/views/user_edit.ms
@@ -1,9 +1,14 @@
+<div class="pull-left">
+    <a class="btn btn-lg btn-default slide back" href="#/users/{{Username}}"><span class="glyphicon glyphicon-chevron-left"></span> {{Username}} info</a>
+</div>
+<div class="clearfix"></div>
+<div class="view-title">Edit {{Username}}</div>
+
+<div class="br"></div>
+
 <form action="#/users/{{Username}}" method="PUT" class="form-horizontal">
 
 <div class="panel panel-default">
-    <div class="panel-heading">
-        <h3 class="panel-title">{{Username}}</h3>
-    </div>
     <div class="panel-body">
         <div class="form-group">
             <label for="username" class="col-sm-4 control-label">Username</label>
diff --git a/views/user_info.ms b/views/user_info.ms
index 91d23859..6249b600 100644
--- a/views/user_info.ms
+++ b/views/user_info.ms
@@ -1,31 +1,35 @@
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <h3 class="panel-title">{{Username}}</h3>
-    </div>
-    <!--<div class="panel-body"></div>-->
-    <ul class="list-group">
-        <li class="list-group-item">
-            <div class="row">
-                <div class="col-sm-4 text-right"><strong>Username</strong></div>
-                <div class="col-sm-8"> {{Username}}</div>
-            </div>
-        </li>
-        <li class="list-group-item">
-            <div class="row">
-                <div class="col-sm-4 text-right"><strong>Fullname</strong></div>
-                <div class="col-sm-8"> {{Fullname}}</div>
-            </div>
-        </li>
-        <li class="list-group-item">
-            <div class="row">
-                <div class="col-sm-4 text-right"><strong>Mail</strong></div>
-                <div class="col-sm-8"> {{Mail}}</div>
-            </div>
-        </li>
-    </ul>
+<div class="pull-left">
+    <a class="btn btn-lg btn-default slide back" href="#/users"><span class="glyphicon glyphicon-chevron-left"></span> User list</a>
 </div>
+<div class="pull-right">
+    <a href="#/users/{{Username}}/edit" class="btn btn-lg btn-info slide"><span class="glyphicon glyphicon-edit"></span> Edit</a>
+</div>
+<div class="clearfix"></div>
+<div class="view-title">{{Username}}</div>
 
-<div class="row text-center">
-    <div class="col-sm-6"><a href="#/users/{{Username}}/edit" class="btn btn-lg btn-info slide"><span class="glyphicon glyphicon-edit"></span> Edit</a></div>
-    <div class="col-sm-6"><a href="#/users/{{Username}}/delete" class="btn btn-lg btn-danger slide back"><span class="glyphicon glyphicon-trash"></span> Delete</a></div>
+<div class="br"></div>
+
+<ul class="list-group">
+    <li class="list-group-item">
+        <div class="row">
+            <div class="col-sm-4 text-right"><strong>Username</strong></div>
+            <div class="col-sm-8"> {{Username}}</div>
+        </div>
+    </li>
+    <li class="list-group-item">
+        <div class="row">
+            <div class="col-sm-4 text-right"><strong>Fullname</strong></div>
+            <div class="col-sm-8"> {{Fullname}}</div>
+        </div>
+    </li>
+    <li class="list-group-item">
+        <div class="row">
+            <div class="col-sm-4 text-right"><strong>Mail</strong></div>
+            <div class="col-sm-8"> {{Mail}}</div>
+        </div>
+    </li>
+</ul>
+
+<div class="text-center">
+    <a href="#/users/{{Username}}/delete" class="btn btn-lg btn-danger slide back"><span class="glyphicon glyphicon-trash"></span> Delete</a>
 </div>
diff --git a/views/user_list.ms b/views/user_list.ms
index 32e04367..dec68f0c 100644
--- a/views/user_list.ms
+++ b/views/user_list.ms
@@ -1,19 +1,20 @@
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <h1 class="panel-title">Users</h1>
-    </div>
-    <div class="list-group">
-    {{#Users}}
-        <a href="#/users/{{Username}}" class="list-group-item slide">
-            <h4 class="pull-left list-group-item-heading">{{Username}} <small>{{Fullname}}</small></h4>
-            <span class="glyphicon glyphicon-chevron-right pull-right"></span>
-            <div class="clearfix"></div>
-            <p class="list-group-item-text">{{Mail}}</p>
-        </a>
-    {{/Users}}
-    </div>
+<div class="pull-left">
+    <a href="#/" class="btn btn-lg btn-default slide back"><span class="glyphicon glyphicon-chevron-left"></span> Menu</a>
 </div>
-
-<div class="text-center">
+<div class="pull-right">
     <a href="#/users/create" class="btn btn-lg btn-success slide"><span class="glyphicon glyphicon-plus"></span> New user</a>
 </div>
+<div class="clearfix"></div>
+<div class="view-title">Users</div>
+<div class="br"></div>
+
+<div class="list-group">
+{{#Users}}
+    <a href="#/users/{{Username}}" class="list-group-item slide">
+        <h4 class="pull-left list-group-item-heading">{{Username}} <small>{{Fullname}}</small></h4>
+        <span class="glyphicon glyphicon-chevron-right pull-right"></span>
+        <div class="clearfix"></div>
+        <p class="list-group-item-text">{{Mail}}</p>
+    </a>
+{{/Users}}
+</div>