diff --git a/css/style.css b/css/style.css
index 7429eb20..8906d80f 100644
--- a/css/style.css
+++ b/css/style.css
@@ -16,7 +16,7 @@ html, body {
 }
 
 #slider-container {
-    width: 1000px;
+    width: 1050px;
     height: 100%;
 }
 
diff --git a/js/app.js b/js/app.js
index b00e0858..73e675ec 100644
--- a/js/app.js
+++ b/js/app.js
@@ -87,17 +87,16 @@ app = Sammy('#main', function (sam) {
             blockSize = $('#slider').width();
 
             if (store.get('slide') == 'back') {
-                $('#slideBack').show().css('display', 'inline-block').css('margin-left', '-'+ blockSize +'px');
+                $('#slideBack').css('display', 'inline-block').css('margin-left', '-'+ 2*blockSize +'px');
                 rendered.appendTo($('#slideBack'));
-                $('#main').animate({marginLeft: blockSize +'px'}, 500);
-                $('#slideBack').animate({marginLeft: '0'}, 500, function() {
+                $('#main').animate({marginLeft: blockSize +'px'}, 500, function() {
                     $('#main').html($('#slideBack').html());
                     $('#main').css('margin-left', '0');
                     leSwap();
                 });
                 store.clear('slide');
             } else if (store.get('slide') == 'to') {
-                $('#slideTo').show().css('display', 'inline-block');
+                $('#slideTo').css('display', 'inline-block');
                 rendered.appendTo($('#slideTo'));
 				$('#main').animate({marginLeft: '-'+ blockSize +'px'}, 500, function() {
                     $('#main').html($('#slideTo').html());
@@ -187,6 +186,12 @@ app = Sammy('#main', function (sam) {
             c.view('user_info', data);
         });
     });
+
+    sam.get('#/users/:user/edit', function (c) {
+        c.api('/users/'+ c.params['user'], function(data) {
+            c.view('user_edit', data);
+        });
+    });
 });
 
 
diff --git a/views/user_edit.ms b/views/user_edit.ms
new file mode 100644
index 00000000..8fac2bb7
--- /dev/null
+++ b/views/user_edit.ms
@@ -0,0 +1,33 @@
+<form action="#/users/{{Username}}/edit" id="form" 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>
+            <div class="col-sm-8">
+                <input type="text" name="username" class="form-control" placeholder="{{Username}}" disabled>
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="username" class="col-sm-4 control-label">Fullname</label>
+            <div class="col-sm-8">
+                <input type="text" name="username" class="form-control" placeholder="{{Fullname}}">
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="username" class="col-sm-4 control-label">Mail</label>
+            <div class="col-sm-8">
+                <input type="email" name="username" class="form-control" placeholder="{{Mail}}">
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="text-center">
+    <input type="submit" class="btn btn-lg btn-success slide back" value="Save">
+</div>
+
+</form>
diff --git a/views/user_info.ms b/views/user_info.ms
index 7fd7441b..9755790f 100644
--- a/views/user_info.ms
+++ b/views/user_info.ms
@@ -4,8 +4,28 @@
     </div>
     <!--<div class="panel-body"></div>-->
     <ul class="list-group">
-        <li class="list-group-item"><strong>Username</strong>&nbsp;&nbsp; {{Username}}</li>
-        <li class="list-group-item"><strong>Fullname</strong>&nbsp;&nbsp; {{Fullname}}</li>
-        <li class="list-group-item"><strong>Mail</strong>&nbsp;&nbsp; {{Mail}}</li>
+        <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>
+
+<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" class="btn btn-lg btn-danger slide back"><span class="glyphicon glyphicon-trash"></span> Delete</a></div>
+</div>