diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html
index aa8dd64372e..86eef7a7a00 100644
--- a/zeppelin-web/src/app/interpreter/interpreter.html
+++ b/zeppelin-web/src/app/interpreter/interpreter.html
@@ -19,16 +19,16 @@ <h3 class="new_h3">
           Interpreters
         </h3>
         <div class="pull-right" style="margin-top:10px;">
-          <span style="cursor:pointer;margin-right:8px;"
+          <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>
-          <span class="btn btn-default fa fa-plus"
-                ng-click="showAddNewSetting = !showAddNewSetting"
-                style="margin-right:6px;">
+          <button class="btn btn-default btn-sm"
+                  ng-click="showAddNewSetting = !showAddNewSetting">
+            <i class="fa fa-plus"></i>
             Create
-          </span>
+          </button>
         </div>
       </div>
     </div>
diff --git a/zeppelin-web/src/app/notebook/notebook-actionBar.html b/zeppelin-web/src/app/notebook/notebook-actionBar.html
index 28dd84e7cd3..0466c31b75c 100644
--- a/zeppelin-web/src/app/notebook/notebook-actionBar.html
+++ b/zeppelin-web/src/app/notebook/notebook-actionBar.html
@@ -61,32 +61,34 @@ <h3>
               tooltip-placement="bottom" tooltip="Export the notebook">
         <i class="fa fa-download"></i>
       </button>
-        <ul class="dropdown-menu" role="menu" style="width:250px">
-          <li>
-            <div class="cron-preset-container">
-              <div>
-                <input type="text"
-                       dropdown-input
-                       placeholder="commit message"
-                       id="note.checkpoint.message"
-                       ng-model="note.checkpoint.message"/>
-                <button type="button"
-                  class="btn btn-default btn-xs"
-                  ng-hide="viewOnly"
-                  ng-click="checkpointNotebook(note.checkpoint.message)"
-                  tooltip-placement="bottom" tooltip="Commit the notebook">Commit
-                </button>
-              </div>
+      <button type="button"
+              class="btn btn-default btn-xs dropdown-toggle"
+              ng-hide="viewOnly"
+              data-toggle="dropdown"
+              tooltip-placement="bottom" tooltip="Version control">
+        <i class="fa fa-file-code-o"></i>
+      </button>
+      <ul class="dropdown-menu" role="menu" style="width:250px">
+        <li>
+          <div class="commit-container">
+            <div>
+              <input type="text"
+                     dropdown-input
+                     placeholder="commit message"
+                     id="note.checkpoint.message"
+                     style="width: 145px;"
+                     ng-model="note.checkpoint.message"/>
+              <button type="button"
+                      class="btn btn-default btn-xs"
+                      ng-hide="viewOnly"
+                      ng-click="checkpointNotebook(note.checkpoint.message)"
+                      style="margin-left: 4px;"
+                      tooltip-placement="bottom" tooltip="Commit the notebook">Commit
+              </button>
             </div>
-          </li>
-        </ul>
-        <button type="button"
-                class="btn btn-default btn-xs dropdown-toggle"
-                ng-hide="viewOnly"
-                data-toggle="dropdown"
-                tooltip-placement="bottom" tooltip="Version control">
-          <i class="fa fa-file-code-o"></i>
-        </button>
+          </div>
+        </li>
+      </ul>
     </span>
 
 <!-- put the delete action by itself for your protection -->
@@ -157,7 +159,7 @@ <h3>
             data-toggle="modal"
             data-target="#shortcutModal"
             tooltip-placement="bottom" tooltip="List of shortcut">
-          <i class="icon-question"></i>
+          <i class="fa fa-keyboard-o"></i>
         </button>
         <button type="button"
             class="btn btn-default btn-xs"
diff --git a/zeppelin-web/src/app/notebook/notebook.css b/zeppelin-web/src/app/notebook/notebook.css
index 6cdc40796cc..6c9a190d552 100644
--- a/zeppelin-web/src/app/notebook/notebook.css
+++ b/zeppelin-web/src/app/notebook/notebook.css
@@ -210,6 +210,19 @@
   border: 0;
 }
 
+.commit-container {
+  padding: 10px 20px 6px 20px;
+  font-weight: normal;
+  word-wrap: break-word;
+  white-space: initial;
+}
+
+/* overwrite bootstrap css for version control button */
+.btn-group > .btn + .dropdown-toggle {
+  padding-right: 5px;
+  padding-left: 5px;
+}
+
 .cron-preset-container {
   padding: 10px 20px 0 20px;
   font-weight: normal;
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.css b/zeppelin-web/src/app/notebook/paragraph/paragraph.css
index 3e620b5738f..cea3ebde4c7 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.css
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.css
@@ -422,6 +422,23 @@ table.dataTable.table-condensed .sorting_desc:after {
   border-bottom: 2px solid #CCC;
 }
 
+.handsontable .columnSorting.ascending::after {
+  content: '\f160';
+  margin-left: 3px;
+  font-size: 12px;
+  font-family: FontAwesome;
+  line-height: 2;
+}
+
+.handsontable .columnSorting.descending::after {
+  content: '\f161';
+  margin-left: 3px;
+  font-size: 12px;
+  margin-left: 3px;
+  font-family: FontAwesome;
+  line-height: 2;
+}
+
 /*
   Pivot CSS
 */