diff --git a/src/oauth2views/account.ejs b/src/oauth2views/account.ejs
index 6d8bea364..3f1777fe0 100644
--- a/src/oauth2views/account.ejs
+++ b/src/oauth2views/account.ejs
@@ -1,5 +1,17 @@
-<p>User id: <%= user.id %></p>
-<p>Username: <%= user.username %></p>
-<p>Email: <%= user.email %></p>
+<% include header %>
 
-<a href="/api/v1/session/logout">Logout</a>
+<div class="container">
+    <form action="/api/v1/session/login" method="post">
+        <div class="row">
+            <div class="col-md-2"></div>
+            <div class="col-md-8">
+                <div class="alert alert-danger">
+                    Invalid OAuth Client
+                </div>
+            </div>
+            <div class="col-md-2"></div>
+        </div>
+    </form>
+</div>
+
+<% include footer %>
diff --git a/src/oauth2views/dialog.ejs b/src/oauth2views/dialog.ejs
index b47d4e6c7..3938d3e75 100644
--- a/src/oauth2views/dialog.ejs
+++ b/src/oauth2views/dialog.ejs
@@ -24,8 +24,8 @@
         </div>
         <div class="row">
           <div class="col-sm-12">
-            <input class="btn btn-red btn-block" type="submit" value="Deny" name="cancel" id="deny"/>
-            <input class="btn btn-green btn-block" type="submit" value="Allow"/>
+            <input class="btn btn-danger btn-outline" type="submit" value="Deny" name="cancel" id="deny"/>
+            <input class="btn btn-success btn-outline" type="submit" value="Allow"/>
           </div>
         </div>
       </div>
diff --git a/src/oauth2views/footer.ejs b/src/oauth2views/footer.ejs
index 5179adefc..e31e0cfbd 100644
--- a/src/oauth2views/footer.ejs
+++ b/src/oauth2views/footer.ejs
@@ -1,3 +1,29 @@
 
+    <!-- angularjs scripts -->
+    <script src="/3rdparty/js/angular.js"></script>
+    <script src="/3rdparty/js/angular-loader.min.js"></script>
+    <script src="/3rdparty/js/angular-route.min.js"></script>
+    <script src="/3rdparty/js/angular-animate.min.js"></script>
+    <script src="/3rdparty/js/angular-base64.min.js"></script>
+    <script src="/3rdparty/js/autofill-event.js"></script>
+
+    <!-- jQuery Version 1.11.0 -->
+    <script src="/3rdparty/sb-admin-2/js/jquery-1.11.0.js"></script>
+
+    <!-- Bootstrap Core JavaScript -->
+    <script src="/3rdparty/sb-admin-2/js/bootstrap.min.js"></script>
+
+    <!-- Metis Menu Plugin JavaScript -->
+    <script src="/3rdparty/sb-admin-2/js/plugins/metisMenu/metisMenu.min.js"></script>
+
+    <!-- Custom Theme JavaScript -->
+    <script src="/3rdparty/sb-admin-2/js/sb-admin-2.js"></script>
+
+    <!-- yellowtent -->
+    <script src="/api/v1/oauth/yellowtent.js"></script>
+
+    <!-- angular bootstrap -->
+    <script src="/3rdparty/js/ui-bootstrap-tpls-0.10.0.js"></script>
+
     </body>
 </html>
diff --git a/src/oauth2views/header.ejs b/src/oauth2views/header.ejs
index 1062171d0..5c7144591 100644
--- a/src/oauth2views/header.ejs
+++ b/src/oauth2views/header.ejs
@@ -3,11 +3,24 @@
     <head>
         <title>Yellowtent Login</title>
 
-        <!-- bootstrap -->
-        <link href="/3rdparty/css/bootstrap.min.css" rel="stylesheet" media="screen">
-        <link href="/3rdparty/css/bootstrap-theme.min.css" rel="stylesheet" media="screen">
+        <!-- Bootstrap Core CSS -->
+    <link href="/3rdparty/sb-admin-2/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- MetisMenu CSS -->
+    <link href="/3rdparty/sb-admin-2/css/plugins/metisMenu/metisMenu.min.css" rel="stylesheet">
+
+    <!-- Timeline CSS -->
+    <link href="/3rdparty/sb-admin-2/css/plugins/timeline.css" rel="stylesheet">
+
+    <!-- Custom CSS -->
+    <link href="/3rdparty/sb-admin-2/css/sb-admin-2.css" rel="stylesheet">
+
+    <!-- Morris Charts CSS -->
+    <link href="/3rdparty/sb-admin-2/css/plugins/morris.css" rel="stylesheet">
+
+    <!-- Custom Fonts -->
+    <link href="/3rdparty/sb-admin-2/font-awesome-4.1.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
 
-        <link href="/css/index.css" rel="stylesheet" media="screen">
     </head>
 
     <body>
diff --git a/src/oauth2views/login.ejs b/src/oauth2views/login.ejs
index 954f79a38..1333914e8 100644
--- a/src/oauth2views/login.ejs
+++ b/src/oauth2views/login.ejs
@@ -1,34 +1,26 @@
 <% include header %>
 
-<form action="/api/v1/session/login" method="post">
-  <div class="row">
-    <div class="col-md-3"></div>
-    <div class="col-md-6">
-      <div class="container-fluid">
+<div class="container">
+    <form action="/api/v1/session/login" method="post">
         <div class="row">
-          <div class="col-sm-12">
-            <h2 class="form-signin-heading pull-right">Welcome</h2>
-          </div>
+            <div class="col-md-3"></div>
+            <div class="col-md-6">
+            <h1>Welcome</h1>
+                <form role="form">
+                    <div class="form-group">
+                        <label class="control-label" for="inputUsername">Username</label>
+                        <input type="text" class="form-control" id="inputUsername" name="username" autofocus required>
+                    </div>
+                    <div class="form-group">
+                        <label class="control-label" for="inputPassword">Password</label>
+                        <input type="password" class="form-control" name="password" id="inputPassword" required>
+                    </div>
+                    <input class="btn btn-default btn-outline" type="submit" value="Sign in"/>
+                </form>
+            </div>
+            <div class="col-md-3"></div>
         </div>
-        <div class="row">
-          <div class="col-sm-12">
-            <input type="text" class="form-control" placeholder="Username" name="username" required autofocus>
-          </div>
-        </div>
-        <div class="row">
-          <div class="col-sm-12">
-            <input type="password" class="form-control has-error" placeholder="Password" name="password" required>
-          </div>
-        </div>
-        <div class="row">
-          <div class="col-sm-12">
-            <input class="btn btn-green btn-block" type="submit" value="Sign in"/>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="col-md-3"></div>
-  </div>
-</form>
+    </form>
+</div>
 
 <% include footer %>
