diff --git a/app/controllers/ProfileController.php b/app/controllers/ProfileController.php
index a7bbf4d55d..37641af434 100644
--- a/app/controllers/ProfileController.php
+++ b/app/controllers/ProfileController.php
@@ -22,9 +22,9 @@ class ProfileController extends BaseController
      */
     public function index()
     {
-        View::share('title','Profile');
-        View::share('subTitle',Auth::user()->email);
-        View::share('mainTitleIcon','fa-user');
+        View::share('title', 'Profile');
+        View::share('subTitle', Auth::user()->email);
+        View::share('mainTitleIcon', 'fa-user');
         return View::make('profile.index');
     }
 
@@ -33,9 +33,9 @@ class ProfileController extends BaseController
      */
     public function changePassword()
     {
-        View::share('title',Auth::user()->email);
-        View::share('subTitle','Change your password');
-        View::share('mainTitleIcon','fa-user');
+        View::share('title', Auth::user()->email);
+        View::share('subTitle', 'Change your password');
+        View::share('mainTitleIcon', 'fa-user');
         return View::make('profile.change-password');
     }
 
diff --git a/app/views/profile/change-password.blade.php b/app/views/profile/change-password.blade.php
index 6891c7a6f4..8f1cdfe3f0 100644
--- a/app/views/profile/change-password.blade.php
+++ b/app/views/profile/change-password.blade.php
@@ -1,43 +1,41 @@
 @extends('layouts.default')
 @section('content')
-<div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12">
-        <p class="text-info">
-            Use this extremely obvious form to change your password.
-        </p>
-    </div>
-</div>
 <div class="row">
     <div class="col-lg-6 col-md-12 col-sm-12">
-
-        {{Form::open(['class' => 'form-horizontal'])}}
-            <div class="form-group">
-                <label for="inputOldPassword" class="col-sm-4 control-label">Old password</label>
-                <div class="col-sm-8">
-                    <input type="password" class="form-control" id="inputOldPassword" placeholder="Old password" name="old">
-                </div>
+        <div class="panel panel-primary">
+            <div class="panel-heading">
+                Change your password
             </div>
+            <div class="panel-body">
+                {{Form::open(['class' => 'form-horizontal'])}}
+                    <div class="form-group">
+                        <label for="inputOldPassword" class="col-sm-4 control-label">Old password</label>
+                        <div class="col-sm-8">
+                            <input type="password" class="form-control" id="inputOldPassword" placeholder="Old password" name="old">
+                        </div>
+                    </div>
 
-            <div class="form-group">
-                <label for="inputNewPassword1" class="col-sm-4 control-label">New password</label>
-                <div class="col-sm-8">
-                    <input type="password" class="form-control" id="inputNewPassword1" placeholder="New password" name="new1">
-                </div>
-            </div>
+                    <div class="form-group">
+                        <label for="inputNewPassword1" class="col-sm-4 control-label">New password</label>
+                        <div class="col-sm-8">
+                            <input type="password" class="form-control" id="inputNewPassword1" placeholder="New password" name="new1">
+                        </div>
+                    </div>
 
-            <div class="form-group">
-                <label for="inputNewPassword2" class="col-sm-4 control-label">New password (again)</label>
-                <div class="col-sm-8">
-                    <input type="password" class="form-control" id="inputNewPassword2" placeholder="New password (again)" name="new2">
-                </div>
+                    <div class="form-group">
+                        <label for="inputNewPassword2" class="col-sm-4 control-label">New password (again)</label>
+                        <div class="col-sm-8">
+                            <input type="password" class="form-control" id="inputNewPassword2" placeholder="New password (again)" name="new2">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <div class="col-sm-offset-4 col-sm-10">
+                            <button type="submit" class="btn btn-success">Change your password</button>
+                        </div>
+                    </div>
+                {{Form::close()}}
             </div>
-            <div class="form-group">
-                <div class="col-sm-offset-4 col-sm-10">
-                    <button type="submit" class="btn btn-success">Change your password</button>
-                </div>
-            </div>
-        {{Form::close()}}
-
+        </div>
     </div>
 </div>
 @stop
diff --git a/app/views/profile/index.blade.php b/app/views/profile/index.blade.php
index 00c7bdc119..e640dc4f14 100644
--- a/app/views/profile/index.blade.php
+++ b/app/views/profile/index.blade.php
@@ -1,8 +1,15 @@
 @extends('layouts.default')
 @section('content')
     <div class="row">
-    <div class="col-lg-12 col-md-12 col-sm-12">
-        <p class="lead"><a href="{{route('change-password')}}">Change your password</a></p>
+    <div class="col-lg-6 col-md-12 col-sm-12">
+        <div class="panel panel-primary">
+            <div class="panel-heading">
+                Options
+            </div>
+            <div class="panel-body">
+                <a href="{{route('change-password')}}">Change your password</a>
+            </div>
+        </div>
     </div>
 </div>
 @stop