diff --git a/docs/assets/themes/zeppelin/img/ui-img/configuration_menu.png b/docs/assets/themes/zeppelin/img/ui-img/configuration_menu.png
index 267de0318f9..8b62cf261a4 100644
Binary files a/docs/assets/themes/zeppelin/img/ui-img/configuration_menu.png and b/docs/assets/themes/zeppelin/img/ui-img/configuration_menu.png differ
diff --git a/docs/assets/themes/zeppelin/img/ui-img/interpreter_menu.png b/docs/assets/themes/zeppelin/img/ui-img/interpreter_menu.png
index 31fbcbc81ea..1724beac314 100644
Binary files a/docs/assets/themes/zeppelin/img/ui-img/interpreter_menu.png and b/docs/assets/themes/zeppelin/img/ui-img/interpreter_menu.png differ
diff --git a/zeppelin-web/src/app/configuration/configuration.html b/zeppelin-web/src/app/configuration/configuration.html
index 0bee84d7939..240d77fd3f6 100644
--- a/zeppelin-web/src/app/configuration/configuration.html
+++ b/zeppelin-web/src/app/configuration/configuration.html
@@ -40,11 +40,11 @@ <h3 class="new_h3">
             <th>value</th>
           </tr>
           </thead>
-          <tr ng-repeat="(key, value) in configurations" >
+          <tr ng-repeat="key in configurations | sortByKey" >
             <td>{{key}}</td>
             <td>
               <div class="hiding_overflow">
-                {{value}}
+                {{configurations[key]}}
               </div>
             </td>
           </tr>
diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html
index ce716d5341d..abb83d8a65e 100644
--- a/zeppelin-web/src/app/interpreter/interpreter.html
+++ b/zeppelin-web/src/app/interpreter/interpreter.html
@@ -19,11 +19,11 @@ <h3 class="new_h3">
           Interpreters
         </h3>
         <div class="pull-right" style="margin-top:10px;">
-          <span style="cursor:pointer;margin-right:4px;"
-                ng-click="showRepositoryInfo = !showRepositoryInfo"
-                tooltip-placement="bottom" tooltip="Repository information">
-            <i class="fa fa-cog" ng-style="{color: showRepositoryInfo ? '#3071A9' : 'black' }"></i>
-          </span>
+          <button class="btn btn-default btn-sm"
+                  ng-click="showRepositoryInfo = !showRepositoryInfo">
+            <i class="fa fa-database" ng-style="{color: showRepositoryInfo ? '#3071A9' : 'black' }"></i>
+            Repository
+          </button>
           <button class="btn btn-default btn-sm"
                   ng-click="showAddNewSetting = !showAddNewSetting">
             <i class="fa fa-plus"></i>
diff --git a/zeppelin-web/src/app/jobmanager/jobmanager.html b/zeppelin-web/src/app/jobmanager/jobmanager.html
index 598c3f7c006..2884b858d41 100644
--- a/zeppelin-web/src/app/jobmanager/jobmanager.html
+++ b/zeppelin-web/src/app/jobmanager/jobmanager.html
@@ -41,8 +41,7 @@ <h3 class="new_h3">
         <span
           ng-switch-when="FINISHED">
           <i style="color: green; margin-right: 3px;" class="fa fa-circle"
-             ng-click=""
-             tooltip="FINISHED">
+             ng-click="">
           </i>
           {{jobStatus}}
         </span>
@@ -50,8 +49,7 @@ <h3 class="new_h3">
           ng-switch-when="RUNNING"
           style="margin-right: 3px;">
           <i style="color: blue" class="fa fa-spinner"
-             ng-click=""
-             tooltip="RUNNING">
+             ng-click="">
           </i>
           {{jobStatus}}
         </span>
@@ -59,8 +57,7 @@ <h3 class="new_h3">
           ng-switch-when="READY"
           style="margin-right: 3px;">
           <i style="color: green" class="fa fa-circle-o"
-             ng-click=""
-             tooltip="READY">
+             ng-click="">
           </i>
           {{jobStatus}}
         </span>
@@ -68,9 +65,7 @@ <h3 class="new_h3">
           ng-switch-when="PENDING"
           style="margin-right: 3px;">
           <i style="color: gray" class="fa fa-circle"
-             ng-click=""
-             tooltip="PENDING"
-          >
+             ng-click="">
           </i>
           {{jobStatus}}
         </span>
@@ -78,8 +73,7 @@ <h3 class="new_h3">
           ng-switch-when="ABORT"
           style="margin-right: 3px;">
           <i style="color: orange" class="fa fa-circle"
-             ng-click=""
-             tooltip="ABORT">
+             ng-click="">
           </i>
           {{jobStatus}}
         </span>
@@ -87,8 +81,7 @@ <h3 class="new_h3">
           ng-switch-when="ERROR"
           style="margin-right: 3px;">
           <i style="color: red" class="fa fa-circle"
-             ng-click=""
-             tooltip="ERROR">
+             ng-click="">
           </i>
           {{jobStatus}}
         </span>