diff --git a/openid-connect-server/src/main/webapp/resources/admin/approve_test.html b/openid-connect-server/src/main/webapp/resources/mockup/approve_test.html
similarity index 100%
rename from openid-connect-server/src/main/webapp/resources/admin/approve_test.html
rename to openid-connect-server/src/main/webapp/resources/mockup/approve_test.html
diff --git a/openid-connect-server/src/main/webapp/resources/admin/bootstrap2_test.html b/openid-connect-server/src/main/webapp/resources/mockup/bootstrap2_test.html
similarity index 100%
rename from openid-connect-server/src/main/webapp/resources/admin/bootstrap2_test.html
rename to openid-connect-server/src/main/webapp/resources/mockup/bootstrap2_test.html
diff --git a/openid-connect-server/src/main/webapp/resources/admin/edit_client.html b/openid-connect-server/src/main/webapp/resources/mockup/edit_client.html
similarity index 100%
rename from openid-connect-server/src/main/webapp/resources/admin/edit_client.html
rename to openid-connect-server/src/main/webapp/resources/mockup/edit_client.html
diff --git a/openid-connect-server/src/main/webapp/resources/admin/main.html b/openid-connect-server/src/main/webapp/resources/mockup/main.html
similarity index 100%
rename from openid-connect-server/src/main/webapp/resources/admin/main.html
rename to openid-connect-server/src/main/webapp/resources/mockup/main.html
diff --git a/openid-connect-server/src/main/webapp/resources/mockup/manage_client_test.html b/openid-connect-server/src/main/webapp/resources/mockup/manage_client_test.html
new file mode 100644
index 000000000..20e34e360
--- /dev/null
+++ b/openid-connect-server/src/main/webapp/resources/mockup/manage_client_test.html
@@ -0,0 +1,133 @@
+
+
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+
+
+    <base href="../../" />
+
+    <meta charset="utf-8">
+    <title>OpenID Connect - welcome</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <!-- Le styles -->
+    <link href="resources/boostrap2/css/bootstrap.css" rel="stylesheet">
+    <link href="resources/boostrap2/css/bootstrap-responsive.css" rel="stylesheet">
+
+    <style type="text/css">
+        body {
+            padding-top: 60px;
+            padding-bottom: 40px;
+        }
+        .sidebar-nav {
+            padding: 9px 0;
+        }
+
+        h1,label {
+            text-shadow: 1px 1px 1px #FFFFFF;
+        }
+
+        .brand {
+            background: url("resources/images/openid_small.png") no-repeat scroll 7px 7px transparent;
+        }
+    </style>
+
+    <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+    <!--[if lt IE 9]>
+    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+
+    <!-- Le fav and touch icons -->
+    <link rel="shortcut icon" href="../boostrap2/ico/favicon.ico">
+    <link rel="apple-touch-icon-precomposed" sizes="114x114" href="../boostrap2/ico/apple-touch-icon-114-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" sizes="72x72" href="../boostrap2/ico/apple-touch-icon-72-precomposed.png">
+    <link rel="apple-touch-icon-precomposed" href="../boostrap2/ico/apple-touch-icon-57-precomposed.png">
+</head>
+
+<body><div class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+        <div class="container-fluid">
+            <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </a>
+            <a class="brand" style="padding-left: 35px" href="#">OpenID Connect Server</a>
+            <div class="nav-collapse">
+                <ul class="nav">
+                    <li class="active"><a href="#">Home</a></li>
+                    <li><a href="#about">About</a></li>
+                    <li><a href="#contact">Statistics</a></li>
+                    <li><a href="#contact">Contact</a></li>
+                </ul>
+                <p class="navbar-text pull-right">Logged in as <a href="#">username</a></p>
+            </div><!--/.nav-collapse -->
+        </div>
+    </div>
+</div><div class="container-fluid">
+    <div class="row-fluid">
+        <div class="span2">
+            <div class="well sidebar-nav">
+                <ul class="nav nav-list">
+                    <li class="nav-header">Administrative</li>
+                    <li><a href="admin/manage/clients">Manage Clients</a></li>
+                    <li><a href="#">White Lists</a></li>
+                    <li><a href="#">Black Lists</a></li>
+                    <li class="nav-header">Personal</li>
+                    <li><a href="#">Manage Sites</a></li>
+                    <li><a href="#">Manage Active Tokens</a></li>
+                    <li><a href="#">Manage Profiles</a></li>
+                </ul>
+            </div><!--/.well -->
+        </div><!--/span--><div class="span10">
+        <div class="content">
+
+            <ul class="breadcrumb">
+                <li><a href="#">Home</a> <span class="divider">/</span></li>
+                <li class="active">Manage Clients</li>
+            </ul><div class="well">
+            <a class="btn btn-small btn-primary" href="#">New Client</a>
+        </div>
+
+            <table id="client-table">
+                <thead>
+                <tr>
+                    <th>Name</th>
+                    <th>Redirect URL</th>
+                    <th>Grant Types</th>
+                    <th>Scope</th>
+                    <th>Authority</th>
+                    <th class="span8">Description</th>
+                    <th>Refresh Tokens</th>
+                    <th class="span1"></th>
+                    <th class="span1"></th>
+                </tr>
+                </thead>
+                <tbody>
+                </tbody>
+            </table>
+
+            <div class="well">
+                <a class="btn btn-small btn-primary" href="#">New Client</a>
+            </div>
+            <footer>
+                <p>&copy; Company 2012</p>
+            </footer></div>
+    </div>
+    </div>
+</div>
+<!-- Le javascript
+================================================== -->
+<!-- Placed at the end of the document so the pages load faster -->
+<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+<script type="text/javascript" src="resources/boostrap2/js/bootstrap.min.js"></script>
+<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.3.3/underscore-min.js"></script>
+<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/backbone.js/0.9.2/backbone-min.js"></script>
+<script type="text/javascript" src="resources/js/app.js"></script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/openid-connect-server/src/main/webapp/resources/admin/manage_clients.html b/openid-connect-server/src/main/webapp/resources/mockup/manage_clients.html
similarity index 100%
rename from openid-connect-server/src/main/webapp/resources/admin/manage_clients.html
rename to openid-connect-server/src/main/webapp/resources/mockup/manage_clients.html
