diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
index acc7fb4fcf..84413fff4b 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.css
@@ -135,6 +135,7 @@ body {
   border-color: #cecece;
   font-size: 1em;
   margin-bottom: 0;
+  min-height: 4.4em;
 }
 #content-area .top-nav ul.rcue-tabs li {
   margin: 0 0.5em -1px 0;
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less
index 5fa386a81d..ee34dd0f3c 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/admin-console.less
@@ -179,6 +179,7 @@ body {
             border-color: @border-dark-grey;
             font-size: 1em;
             margin-bottom: 0;
+            min-height: 4.4em;
             
             li {
                 margin: 0 0.5em -1px 0;
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css
index 92216b7702..f0bf153759 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.css
@@ -359,6 +359,7 @@ fieldset.border-top {
   margin-bottom: 0;
   float: left;
   margin-top: 0.45454545454545em;
+  font-weight: 400;
 }
 .form-group > label.two-lines {
   margin-top: -2px;
@@ -713,6 +714,9 @@ input[type="email"].tiny {
   font-size: 1.1em;
   margin-right: 0.90909090909091em;
 }
+.changing-selectors.application {
+  padding-left: 12em;
+}
 .changing-selectors .select-title {
   display: inline-block;
 }
diff --git a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less
index e25d6a0048..2e5891ce82 100644
--- a/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less
+++ b/admin-ui-styles/src/main/resources/META-INF/resources/admin-ui/css/forms.less
@@ -416,6 +416,7 @@ fieldset.border-top {
         margin-bottom: 0;
         float: left;
         margin-top: 0.45454545454545em;
+        font-weight: 400;
         
         &.two-lines {
             margin-top: -2px;
@@ -856,6 +857,10 @@ input[type="email"] {
 
 .changing-selectors {
 
+    &.application {
+        padding-left: 12em;
+    }
+
     .select-title {
     
         display: inline-block;
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-credentials.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-credentials.html
index 506cc43be6..0823a47c43 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-credentials.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-credentials.html
@@ -4,8 +4,6 @@
         <div id="content-area" class="col-md-9" role="main">
             <div class="top-nav">
                 <ul class="rcue-tabs">
-                    <li><a href="#/create/application/{{realm.id}}">New Application</a></li>
-                    <li><a href="#/realms/{{realm.id}}/applications">Applications</a></li>
                     <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}">Settings</a></li>
                     <li class="active"><a href="#/realms/{{realm.id}}/applications/{{application.id}}/credentials">Credentials</a></li>
                     <li><a href="#">Installation</a></li>
@@ -15,8 +13,13 @@
                 </ul>
             </div>
             <div id="content">
-                <h2 class="pull-left" data-ng-hide="create">Application <span>{{application.name}}</span> Credentials</h2>
-                <p class="subtitle"></p>
+                <ol class="breadcrumb" data-ng-hide="create">
+                    <li><a href="#/realms/{{realm.id}}">{{realm.realm}}</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications">Applications</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}">{{application.name}}</a></li>
+                    <li class="active">Credentials</li>
+                </ol>
+                <h2 data-ng-hide="create"><span>{{application.name}}</span> Credentials</h2>
                 <form name="credentialForm" novalidate >
                     <fieldset data-ng-show="passwordRequired">
                         <legend uncollapsed><span class="text">Change Password</span></legend>
@@ -28,9 +31,9 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="password">Confirm New Password</label>
+                            <label class="two-lines" for="password">New Password Confirmation</label>
                             <div class="controls">
-                                <input type="password" id="confirmPassword" name="confirmPassword" data-ng-model="confirmPassword" autofocus
+                                <input type="password" id="confirmPassword" name="confirmPassword" data-ng-model="confirmPassword"
                                        required>
                             </div>
                         </div>
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-detail.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-detail.html
index bc23ca3bf5..b9866cd246 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-detail.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-detail.html
@@ -4,8 +4,6 @@
         <div id="content-area" class="col-md-9" role="main">
             <div class="top-nav" data-ng-show="!create">
                 <ul class="rcue-tabs">
-                    <li><a href="#/create/application/{{realm.id}}">New Application</a></li>
-                    <li><a href="#/realms/{{realm.id}}/applications">Applications</a></li>
                     <li class="active"><a href="#/realms/{{realm.id}}/applications/{{application.id}}">Settings</a></li>
                     <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}/credentials">Credentials</a></li>
                     <li><a href="#">Installation</a></li>
@@ -16,19 +14,28 @@
             </div>
             <div class="top-nav" data-ng-show="create">
                 <ul class="rcue-tabs">
-                    <li class="active"><a href="#/create/application/{{realm.id}}">New Application</a></li>
-                    <li><a href="#/realms/{{realm.id}}/applications">Applications</a></li>
+                    <li></li>
                 </ul>
             </div>
             <div id="content">
-                <h2 class="pull-left" data-ng-show="create">New Application</h2>
-                <h2 class="pull-left" data-ng-hide="create">Application <span>{{application.name}}</span></h2>
-                <p class="subtitle"><span class="required">*</span> Required fields</p>
+                <ol class="breadcrumb" data-ng-show="create">
+                    <li><a href="#/realms/{{realm.id}}">{{realm.realm}}</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications">Applications</a></li>
+                    <li class="active">Add Application</li>
+                </ol>
+                <h2 class="pull-left" data-ng-show="create"><span>{{realm.realm}}</span> Add Application</h2>
+                <p class="subtitle" data-ng-show="create"><span class="required">*</span> Required fields</p>
+                <ol class="breadcrumb" data-ng-hide="create">
+                    <li><a href="#/realms/{{realm.id}}">{{realm.realm}}</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications">Applications</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}">{{application.name}}</a></li>
+                    <li class="active">Settings</li>
+                </ol>
+                <h2 data-ng-hide="create"><span>{{application.name}}</span> Settings</h2>
                 <form name="applicationForm" novalidate>
-                    <fieldset>
-                        <legend uncollapsed><span class="text">Application Settings</span></legend>
+                    <fieldset class="border-top">
                         <div class="form-group">
-                            <label for="name">Name</label><span class="required">*</span>
+                            <label for="name">Name <span class="required" data-ng-show="create">*</span></label>
                             <div class="controls">
                             <input type="text" id="name" name="name" data-ng-model="application.name" autofocus
                                    required>
@@ -36,7 +43,7 @@
                         </div>
 
                         <div class="form-group clearfix block">
-                            <label class="control-label">Enabled</label>
+                            <label for="enabled" class="control-label">Enabled</label>
                             <div class="onoffswitch">
                                 <input type="checkbox" data-ng-model="application.enabled" class="onoffswitch-checkbox"
                                        name="enabled" id="enabled">
@@ -50,7 +57,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="adminUrl" class="control-label">Base URL</label>
+                            <label for="baseUrl" class="control-label">Base URL</label>
 
                             <div class="controls">
                                 <input class="input-small" type="text" name="baseUrl" id="baseUrl"
@@ -76,7 +83,6 @@
 
                     <div class="form-actions" data-ng-show="!create">
                         <button type="submit" data-ng-click="save()" class="primary" data-ng-show="changed">Save
-                            changes
                         </button>
                         <button type="submit" data-ng-click="reset()" data-ng-show="changed">Clear changes
                         </button>
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-list.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-list.html
index bf79f8bccd..7033194a18 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-list.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-list.html
@@ -4,16 +4,21 @@
         <div id="content-area" class="col-md-9" role="main">
             <div class="top-nav">
                 <ul class="rcue-tabs">
-                    <li><a href="#/create/application/{{realm.id}}">New Application</a></li>
-                    <li class="active"><a href="#">Applications</a></li>
+                    <li></li>
                 </ul>
             </div>
             <div id="content">
-                <h2 class="pull-left">Applications</h2>
+                <ol class="breadcrumb">
+                    <li><a href="#/realms/{{realm.id}}">{{realm.realm}}</a></li>
+                    <li class="active">Applications</li>
+                </ol>
+                <h2><span>{{realm.realm}}</span> Applications</h2>
+                <div class="feedback info" data-ng-show="!applications || applications.length == 0">
+                    <p><strong>You have not configured applications.</strong><br><a class="button" href="#/create/application/{{realm.id}}">Add Application</a></p>
+                </div>
                 <table>
-                    <caption data-ng-show="!applications || applications.length == 0">No configured applications...</caption>
                     <thead>
-                    <tr >
+                    <tr>
                         <th class="rcue-table-actions" colspan="3">
                             <div class="search-comp clearfix">
                                 <input type="text" placeholder="Search..." class="search">
@@ -23,8 +28,7 @@
                                 </button>
                             </div>
                             <div class="actions">
-                                <a class="button" href="#/create/application/{{realm.id}}">Add</a>
-                                <button class="remove disabled">Remove</button>
+                                <a class="button" href="#/create/application/{{realm.id}}">Add Application</a>
                             </div>
                         </th>
                     </tr>
@@ -46,7 +50,7 @@
                         </td>
                     </tr>
                     </tfoot>
-                    <tbody class="selectable-rows">
+                    <tbody>
                     <tr ng-repeat="app in applications">
                         <td><a href="#/realms/{{realm.id}}/applications/{{app.id}}">{{app.name}}</a></td>
                         <td>{{app.enabled}}</td>
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-detail.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-detail.html
index 2e8a3122f1..9942d34664 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-detail.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-detail.html
@@ -4,20 +4,38 @@
         <div id="content-area" class="col-md-9" role="main">
             <div class="top-nav">
                 <ul class="rcue-tabs">
-                    <li class="active"><a href="#/create/role/{{realm.id}}/applications/{{application.id}}">New {{application.name}} Role</a></li>
-                    <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}/roles">{{application.name}} Roles</a></li>
-                    <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}">{{application.name}} Settings</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}">Settings</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}/credentials">Credentials</a></li>
+                    <li><a href="#">Installation</a></li>
+                    <li class="active"><a href="#/realms/{{realm.id}}/applications/{{application.id}}/roles">Roles</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}/scope-mappings">Scope</a></li>
+                    <li><a href="#">Sessions</a></li>
                 </ul>
             </div>
             <div id="content">
-                <h2 class="pull-left" data-ng-show="create">New Application {{application.name}} Role</h2>
-                <h2 class="pull-left" data-ng-hide="create">Application {{application.name}} Role <span>{{role.name}}</span></h2>
+                <ol class="breadcrumb" data-ng-show="create">
+                    <li><a href="#/realms/{{realm.id}}">{{realm.realm}}</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications">Applications</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}">{{application.name}}</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}/roles">Roles</a></li>
+                    <li class="active">Add role</li>
+                </ol>
+                <h2 class="pull-left" data-ng-show="create"><span>{{application.name}}</span> Add Role</h2>
                 <p class="subtitle" data-ng-show="create"><span class="required">*</span> Required fields</p>
+                
+                <ol class="breadcrumb" data-ng-hide="create">
+                    <li><a href="#/realms/{{realm.id}}">{{realm.realm}}</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications">Applications</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}">{{application.name}}</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}/roles">Roles</a></li>
+                    <li class="active">{{role.name}}</li>
+                </ol>
+
+                <h2 class="pull-left" data-ng-hide="create"><span>{{application.name}}</span> {{role.name}}</h2>
                 <form name="realmForm" novalidate>
-                    <fieldset>
-                        <legend uncollapsed><span class="text">Details</span> </legend>
+                    <fieldset class="border-top">
                         <div class="form-group">
-                            <label for="name">Role name </label><span class="required" data-ng-show="create">*</span>
+                            <label for="name">Role name <span class="required" data-ng-show="create">*</span></label>
 
                             <div class="controls">
                                 <input type="text" id="name" name="name" data-ng-model="role.name" autofocus
@@ -43,7 +61,6 @@
 
                     <div class="form-actions" data-ng-show="!create">
                         <button type="submit" data-ng-click="save()" class="primary" data-ng-show="changed">Save
-                            changes
                         </button>
                         <button type="submit" data-ng-click="reset()" data-ng-show="changed">Clear changes
                         </button>
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-list.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-list.html
index de4413d321..fc38d64ae1 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-list.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-role-list.html
@@ -4,32 +4,53 @@
         <div id="content-area" class="col-md-9" role="main">
             <div class="top-nav">
                 <ul class="rcue-tabs">
-                    <li><a href="#/create/role/{{realm.id}}/applications/{{application.id}}">New {{application.name}} Role</a></li>
-                    <li class="active"><a href="#/realms/{{realm.id}}/applications/{{application.id}}/roles">{{application.name}} Roles</a></li>
-                    <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}">{{application.name}} Settings</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}">Settings</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}/credentials">Credentials</a></li>
+                    <li><a href="#">Installation</a></li>
+                    <li class="active"><a href="#/realms/{{realm.id}}/applications/{{application.id}}/roles">Roles</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}/scope-mappings">Scope</a></li>
+                    <li><a href="#">Sessions</a></li>
                 </ul>
             </div>
             <div id="content">
-                <h2 class="pull-left">Application <span>{{application.name}}</span> Roles</h2>
+                <ol class="breadcrumb" data-ng-hide="create">
+                    <li><a href="#/realms/{{realm.id}}">{{realm.realm}}</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications">Applications</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}">{{application.name}}</a></li>
+                    <li class="active">Roles</li>
+                </ol>
+                <h2><span>{{application.name}}</span> Roles</h2>
+                <div class="feedback info" data-ng-show="!roles || roles.length == 0">
+                    <p><strong>You have not configured application roles.</strong><br><a class="button" href="#/create/role/{{realm.id}}/applications/{{application.id}}">Add Role</a></p>
+                </div>
+                                
+
                 <table>
-                    <caption data-ng-show="roles && roles.length > 0">Table of realm roles</caption>
-                    <caption data-ng-show="!roles || roles.length == 0">No configured realm roles...</caption>
+                    <caption data-ng-show="roles && roles.length > 0" class="hidden">Table of realm roles</caption>
                     <thead>
-                    <tr data-ng-show="roles && roles.length > 5">
-                        <th class="rcue-table-actions" colspan="2">
-                            <div class="search-comp clearfix">
-                                <input type="text" placeholder="Search..." class="search">
-                                <button class="icon-search tooltipRightTrigger"
-                                        data-original-title="Search by role name.">
-                                    Icon: search
-                                </button>
-                            </div>
-                        </th>
-                    </tr>
-                    <tr>
-                        <th>Role Name</th>
-                        <th>Description</th>
-                    </tr>
+                        <tr>
+                            <th class="rcue-table-actions" colspan="2">
+                                <div class="actions">
+                                    <a class="button" href="#/create/role/{{realm.id}}/applications/{{application.id}}">Add Role</a>
+                                    <!-- <button class="remove disabled">Remove</button> -->
+                                </div>
+                            </th>
+                        </tr>
+                        <tr data-ng-show="roles && roles.length > 5">
+                            <th class="rcue-table-actions" colspan="2">
+                                <div class="search-comp clearfix">
+                                    <input type="text" placeholder="Search..." class="search">
+                                    <button class="icon-search tooltipRightTrigger"
+                                            data-original-title="Search by role name.">
+                                        Icon: search
+                                    </button>
+                                </div>
+                            </th>
+                        </tr>
+                        <tr>
+                            <th>Role Name</th>
+                            <th>Description</th>
+                        </tr>
                     </thead>
                     <tfoot data-ng-show="roles && roles.length > 5"> <!-- todo -->
                     <tr>
@@ -43,7 +64,7 @@
                         </td>
                     </tr>
                     </tfoot>
-                    <tbody class="selectable-rows">
+                    <tbody>
                     <tr ng-repeat="role in roles">
                         <td><a href="#/realms/{{realm.id}}/applications/{{application.id}}/roles/{{role.id}}">{{role.name}}</a></td>
                         <td>{{role.description}}</td>
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-scope-mappings.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-scope-mappings.html
index cfa29f7f44..2c538a1a7d 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-scope-mappings.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/application-scope-mappings.html
@@ -4,8 +4,6 @@
         <div id="content-area" class="col-md-9" role="main">
             <div class="top-nav">
                 <ul class="rcue-tabs">
-                    <li><a href="#/create/application/{{realm.id}}">New Application</a></li>
-                    <li><a href="#/realms/{{realm.id}}/applications">Applications</a></li>
                     <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}">Settings</a></li>
                     <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}/credentials">Credentials</a></li>
                     <li><a href="#">Installation</a></li>
@@ -15,11 +13,17 @@
                 </ul>
             </div>
             <div id="content">
+                <ol class="breadcrumb" data-ng-hide="create">
+                    <li><a href="#/realms/{{realm.id}}">{{realm.realm}}</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications">Applications</a></li>
+                    <li><a href="#/realms/{{realm.id}}/applications/{{application.id}}">{{application.name}}</a></li>
+                    <li class="active">Scope</li>
+                </ol>
                 <h2 class="pull-left"><span>{{application.name}}</span> Scope Mappings</h2>
                 <p class="subtitle"></p>
                 <form name="realmForm" novalidate>
-                    <legend uncollapsed><span class="text">Realm Roles</span> </legend>
-                    <fieldset class="border-top">
+                    <fieldset>
+                        <legend uncollapsed><span class="text">Realm Roles</span></legend>
                         <div class="form-group">
                             <div class="controls changing-selectors">
                                 <div class="select-title">
@@ -49,7 +53,7 @@
                     <fieldset ng-show="applications.length > 0">
                         <legend collapsed><span class="text">Application Roles</span> </legend>
                         <div class="form-group input-select">
-                            <label for="applications">Application: </label>
+                            <label for="applications">Application</label>
                             <div class="input-group">
                                 <div class="select-rcue">
                                     <select id="applications" name="applications" ng-change="changeApplication()" ng-model="targetApp" ng-options="a.name for a in applications">
@@ -58,7 +62,7 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <div class="controls changing-selectors">
+                            <div class="controls changing-selectors application">
                                 <div class="select-title">
                                     <label for="app-available">Available Roles</label>
                                     <select id="app-available" class="form-control" multiple size="5"
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-tokens.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-tokens.html
index 02da4feedb..ccaaec1724 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-tokens.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-tokens.html
@@ -19,8 +19,7 @@
                 </ol>
                 <h2><span>{{realm.realm}}</span> Token Settings</h2>
                 <form name="realmForm" novalidate>
-                    <fieldset>
-                        <legend uncollapsed><span class="text">Token Settings</span></legend>
+                    <fieldset class="border-top">
                         <div class="form-group input-select">
                             <label for="tokenLifespan">Token lifespan</label>
                             <div class="input-group">
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-detail.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-detail.html
index 1494078947..3677ea944b 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-detail.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-detail.html
@@ -25,7 +25,7 @@
                     <li><a href="#/realms/{{realm.id}}/roles">Roles</a></li>
                     <li class="active">Add Role</li>
                 </ol>
-                <h2 class="pull-left" data-ng-show="create">Add Realm Role</h2>
+                <h2 class="pull-left" data-ng-show="create"><span>{{realm.realm}}</span> Add Role</h2>
                 <p class="subtitle" data-ng-show="create"><span class="required">*</span> Required fields</p>
                 <form name="realmForm" novalidate>
                     <fieldset class="border-top">
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-mappings.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-mappings.html
index 665c89a48a..33b8a25ca4 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-mappings.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-mappings.html
@@ -50,7 +50,7 @@
                     <fieldset ng-show="applications.length > 0">
                         <legend collapsed><span class="text">Application Roles</span> </legend>
                         <div class="form-group input-select">
-                            <label for="applications">Application: </label>
+                            <label for="applications">Application</label>
                             <div class="input-group">
                                 <div class="select-rcue">
                                     <select id="applications" name="applications" ng-change="changeApplication()" ng-model="application" ng-options="a.name for a in applications">
@@ -59,7 +59,7 @@
                             </div>
                         </div>
                         <div class="form-group" ng-show="application">
-                            <div class="controls changing-selectors">
+                            <div class="controls changing-selectors application">
                                 <div class="select-title">
                                     <label for="available-app">Available Roles</label>
                                     <select id="available-app" class="form-control" multiple size="5"
diff --git a/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-list.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-list.html
index 9ea14e7c39..28b6dfe54f 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-list.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/user-list.html
@@ -28,7 +28,6 @@
                                 </div>
                                 <div class="actions">
                                     <a class="button" href="#/create/user/{{realm.id}}">Add User</a>
-                                    <button class="remove disabled">Remove</button>
                                 </div>
                             </th>
                         </tr>
@@ -53,7 +52,7 @@
                         </td>
                     </tr>
                     </tfoot>
-                    <tbody class="selectable-rows">
+                    <tbody>
                     <tr ng-repeat="user in users">
                         <td><a href="#/realms/{{realm.id}}/users/{{user.username}}">{{user.username}}</a></td>
                         <td>{{user.lastName}}</td>