keycloak-aplcache

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 c0e2a6b..3f6437f 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
@@ -59,7 +59,7 @@
             </fieldset>
 
             <fieldset data-ng-show="!create && (compositeSwitch || role.composite)">
-                <legend collapsed><span class="text">Composite Realm Roles</span> </legend>
+                <legend uncollapsed><span class="text">Composite Realm Roles</span> </legend>
                 <div class="form-group col-sm-10">
                     <div class="controls changing-selectors">
                         <div class="select-title">
@@ -91,7 +91,7 @@
             </fieldset>
 
             <fieldset ng-show="applications.length > 0 && !create && (compositeSwitch || role.composite)">
-                <legend collapsed><span class="text">Composite Application Roles</span> </legend>
+                <legend uncollapsed><span class="text">Composite Application Roles</span> </legend>
                 <div class="form-group input-select">
                     <label class="col-sm-2 control-label" for="applications">Application</label>
                     <div class="col-sm-4">

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 5b7941d..9432d99 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
@@ -54,16 +54,20 @@
 
             <fieldset ng-show="applications.length > 0">
                 <legend><span class="text">Application Roles</span> </legend>
-                <div class="form-group input-select col-sm-10">
-                    <label class="control-label" for="applications">Application</label>
-                    <div class="input-group">
-                        <div class="select-kc">
-                            <select id="applications" name="applications" ng-change="changeApplication()" ng-model="targetApp" ng-options="a.name for a in (applications|remove:application:'id')">
-                                <option value="" selected> Select an Application </option>
-                            </select>
+                <div class="form-group input-select">
+                    <label class="col-sm-2 control-label" for="applications">Application</label>
+                    <div class="col-sm-4">
+                        <div class="input-group">
+                            <div class="select-kc">
+                                <select id="applications" name="applications" ng-change="changeApplication()" ng-model="targetApp" ng-options="a.name for a in (applications|remove:application:'id')">
+                                    <option value="" selected> Select an Application </option>
+                                </select>
+                            </div>
                         </div>
                     </div>
-                    <div class="controls changing-selectors" ng-show="targetApp">
+                </div>
+                <div class="form-group" ng-show="targetApp">
+                    <div class="controls changing-selectors col-sm-10">
                         <div class="select-title">
                             <label class="control-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/oauth-client-scope-mappings.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-scope-mappings.html
index b26dd71..111a98c 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-scope-mappings.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/oauth-client-scope-mappings.html
@@ -52,16 +52,20 @@
 
             <fieldset ng-show="applications.length > 0">
                 <legend><span class="text">Application Roles</span> </legend>
-                <div class="form-group input-select col-sm-10">
-                    <label class="control-label" for="applications">Application</label>
-                    <div class="input-group">
-                        <div class="select-kc">
-                            <select id="applications" name="applications" ng-change="changeApplication()" ng-model="targetApp" ng-options="a.name for a in (applications)">
-                                <option value="" selected> Select an Application </option>
-                            </select>
+                <div class="form-group input-select">
+                    <label class="col-sm-2 control-label" for="applications">Application</label>
+                    <div class="col-sm-4">
+                        <div class="input-group">
+                            <div class="select-kc">
+                                <select id="applications" name="applications" ng-change="changeApplication()" ng-model="targetApp" ng-options="a.name for a in (applications)">
+                                    <option value="" selected> Select an Application </option>
+                                </select>
+                            </div>
                         </div>
                     </div>
-                    <div class="controls changing-selectors" data-ng-show="targetApp">
+                </div>
+                <div class="form-group" data-ng-show="targetApp">
+                    <div class="controls changing-selectors col-sm-10">
                         <div class="select-title">
                             <label class="control-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-default-roles.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-default-roles.html
index 81d329b..1dc2751 100755
--- a/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-default-roles.html
+++ b/admin-ui/src/main/resources/META-INF/resources/admin/partials/realm-default-roles.html
@@ -7,7 +7,7 @@
             <li><a href="#/realms/{{realm.realm}}">Settings</a></li>
             <li class="active">Registration</li>
         </ol>
-        <h2><span>{{realm.realm}}</span> Registration Settings</h2>
+        <h2><span>{{realm.realm}}</span> Default Roles</h2>
         <form class="form-horizontal" name="realmForm" novalidate>
             <fieldset>
                 <legend><span class="text">Realm Default Roles</span> </legend>
@@ -46,13 +46,17 @@
                 <div class="form-group input-select">
                     <label class="col-sm-2 control-label" for="applications">Application</label>
                     <div class="col-sm-4">
-                        <div class="select-kc">
-                            <select id="applications" name="applications" ng-change="changeApplication()" ng-model="application" ng-options="a.name for a in applications">
-                                <option value="" selected> Select an Application...</option>
-                            </select>
+                        <div class="input-group">
+                            <div class="select-kc">
+                                <select id="applications" name="applications" ng-change="changeApplication()" ng-model="application" ng-options="a.name for a in applications">
+                                    <option value="" selected> Select an Application...</option>
+                                </select>
+                            </div>
                         </div>
                     </div>
-                    <div class="controls changing-selectors" ng-show="application">
+                </div>
+                <div class="form-group" ng-show="application">
+                    <div class="controls changing-selectors col-sm-10">
                         <div class="select-title">
                             <label class="control-label" for="available-app">Available Roles</label>
                             <select id="available-app" class="form-control" multiple size="5"
@@ -80,7 +84,6 @@
                     </div>
                 </div>
             </fieldset>
-
         </form>
     </div>
 </div>
\ No newline at end of file

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 86ceccd..cb65d93 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
@@ -62,7 +62,7 @@
                 <div class="form-group">
                     <div class="controls changing-selectors col-sm-10">
                         <div class="select-title">
-                            <label for="available">Available Roles</label>
+                            <label class="control-label" for="available">Available Roles</label>
                             <select id="available" class="form-control" multiple size="5"
                                     ng-multiple="true"
                                     ng-model="selectedRealmRoles"
@@ -78,7 +78,7 @@
                             </button>
                         </div>
                         <div class="select-title">
-                            <label for="assigned">Assigned Roles</label>
+                            <label class="control-label" for="assigned">Assigned Roles</label>
                             <select id="assigned" class="form-control" multiple size=5
                                     ng-multiple="true"
                                     ng-model="selectedRealmMappings"
@@ -91,16 +91,20 @@
 
             <fieldset ng-show="applications.length > 0 && !create && (compositeSwitch || role.composite)">
                 <legend uncollapsed><span class="text">Composite Application Roles</span> </legend>
-                <div class="form-group input-select col-sm-10">
-                    <label for="applications">Application</label>
-                    <div class="input-group">
-                        <div class="select-kc">
-                            <select id="applications" name="applications" ng-change="changeApplication()" ng-model="compositeApp" ng-options="a.name for a in applications">
-                                <option value="" selected> Select an Application...</option>
-                            </select>
+                <div class="form-group input-select">
+                    <label class="col-sm-2 control-label" for="applications">Application</label>
+                    <div class="col-sm-4">
+                        <div class="input-group">
+                            <div class="select-kc">
+                                <select id="applications" name="applications" ng-change="changeApplication()" ng-model="compositeApp" ng-options="a.name for a in applications">
+                                    <option value="" selected> Select an Application...</option>
+                                </select>
+                            </div>
                         </div>
                     </div>
-                    <div class="controls changing-selectors" ng-show="compositeApp">
+                </div>
+                <div class="form-group" ng-show="compositeApp">
+                    <div class="controls changing-selectors col-sm-10">
                         <div class="select-title">
                             <label class="control-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/role-mappings.html b/admin-ui/src/main/resources/META-INF/resources/admin/partials/role-mappings.html
index d8e0208..0e61d1a 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
@@ -17,10 +17,10 @@
 
             <fieldset>
                 <legend><span class="text">Realm Roles</span> </legend>
-                <div class="form-group">
-                    <div class="controls changing-selectors col-sm-10">
+                <div class="form-group col-sm-10">
+                    <div class="controls changing-selectors">
                         <div class="select-title">
-                            <label for="available">Available Roles</label>
+                            <label class="control-label" for="available">Available Roles</label>
                             <select id="available" class="form-control" multiple size="5"
                                     ng-multiple="true"
                                     ng-model="selectedRealmRoles"
@@ -36,7 +36,7 @@
                             </button>
                         </div>
                         <div class="select-title">
-                            <label for="assigned">Assigned Roles</label>
+                            <label class="control-label" for="assigned">Assigned Roles</label>
                             <select id="assigned" class="form-control" multiple size=5
                                     ng-multiple="true"
                                     ng-model="selectedRealmMappings"
@@ -49,18 +49,22 @@
 
             <fieldset ng-show="applications.length > 0">
                 <legend><span class="text">Application Roles</span> </legend>
-                <div class="form-group input-select col-sm-10">
-                    <label for="applications">Application</label>
-                    <div class="input-group">
-                        <div class="select-kc">
-                            <select id="applications" name="applications" ng-change="changeApplication()" ng-model="application" ng-options="a.name for a in applications">
-                                <option value="" selected> Select an Application...</option>
-                            </select>
+                <div class="form-group input-select">
+                    <label class="col-sm-2 control-label" for="applications">Application</label>
+                    <div class="col-sm-4">
+                        <div class="input-group">
+                            <div class="select-kc">
+                                <select id="applications" name="applications" ng-change="changeApplication()" ng-model="application" ng-options="a.name for a in applications">
+                                    <option value="" selected> Select an Application...</option>
+                                </select>
+                            </div>
                         </div>
                     </div>
-                    <div class="controls changing-selectors" ng-show="application">
+                </div>
+                <div class="form-group" ng-show="application">
+                    <div class="controls changing-selectors col-sm-10">
                         <div class="select-title">
-                            <label for="available-app">Available Roles</label>
+                            <label class="control-label" for="available-app">Available Roles</label>
                             <select id="available-app" class="form-control" multiple size="5"
                                     ng-multiple="true"
                                     ng-model="selectedApplicationRoles"
@@ -76,7 +80,7 @@
                             </button>
                         </div>
                         <div class="select-title">
-                            <label for="assigned-app">Assigned Roles</label>
+                            <label class="control-label" for="assigned-app">Assigned Roles</label>
                             <select id="assigned-app" class="form-control" multiple size=5
                                     ng-multiple="true"
                                     ng-model="selectedApplicationMappings"

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 6faf13d..ee0e75b 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
@@ -555,7 +555,7 @@ legend .kc-icon-collapse {
     line-height: 30px;
     margin-left: -2px;
     margin-top: -2px;
-    padding: 5px 0.545455em;
+    padding: 5px .496em;
     width: 150%;
 }
 .select-kc option {