diff --git a/v2/assets/css/style.css b/v2/assets/css/style.css
index 0f97202..b6fcd9d 100644
--- a/v2/assets/css/style.css
+++ b/v2/assets/css/style.css
@@ -308,7 +308,15 @@ button[disabled] {
     line-height: 1.5;
     padding: 4px 12px;
     border-radius:7px !important;
+
 }
+
+.btn-cancel
+{
+    border-color: #909AA1;
+    background-color: #909AA1 !important;
+}
+
 .btn-group > .btn {
     border-radius: 7px !important;
 }
@@ -612,10 +620,25 @@ li.incomplete:before, li.incomplete .step {
 .modal-header
 {
     /*background-color: #EFF3F8;*/
-    background-image: url('../img/dialogue-bar.jpg');
+    background-image: url('../img/dialogue-bar1.jpg');
     background-size:cover;
     /*background-position: 50% 50%;*/
 }
+.modal-warning-header
+{
+    padding-top: 13px; 
+    padding-bottom: 13px;
+}
+.modal-warning-body
+{
+    padding-top: 30px; 
+    padding-bottom: 20px;
+}
+.modal-warning-footer
+{
+    padding-top: 8px; 
+    padding-bottom: 8px;
+}
 .bkg-fullscreen
 {
     /*background-color:#EFF3F8;*/
@@ -669,7 +692,7 @@ li.incomplete:before, li.incomplete .step {
 }
 .modal-footer
 {
-    background-image: url('../img/dialogue-bar.jpg');
+    background-image: url('../img/dialogue-bar1.jpg');
     background-size:cover;
 }
 .modal-title
@@ -789,4 +812,24 @@ circle[depth='3'] {
 }
 circle[depth='4'] {
     fill: #D15B47 !important;
-}
\ No newline at end of file
+}
+.table-hover > tbody > tr > td.success:hover,
+.table-hover > tbody > tr > th.success:hover,
+.table-hover > tbody > tr.success:hover > td,
+.table-hover > tbody > tr.success:hover > th {
+  background-color:rgba(194, 221, 240, 1);
+}
+.table > thead > tr > td.success,
+.table > tbody > tr > td.success,
+.table > tfoot > tr > td.success,
+.table > thead > tr > th.success,
+.table > tbody > tr > th.success,
+.table > tfoot > tr > th.success,
+.table > thead > tr.success > td,
+.table > tbody > tr.success > td,
+.table > tfoot > tr.success > td,
+.table > thead > tr.success > th,
+.table > tbody > tr.success > th,
+.table > tfoot > tr.success > th {
+  background-color:rgba(239, 243, 252, 0.98);
+}
diff --git a/v2/assets/img/dialogue-bar1.jpg b/v2/assets/img/dialogue-bar1.jpg
new file mode 100644
index 0000000..16570d8
Binary files /dev/null and b/v2/assets/img/dialogue-bar1.jpg differ
diff --git a/v2/assets/img/smile_face.png b/v2/assets/img/smile_face.png
new file mode 100644
index 0000000..785910c
Binary files /dev/null and b/v2/assets/img/smile_face.png differ
diff --git a/v2/src/app/app.js b/v2/src/app/app.js
index 151947a..1cdce25 100644
--- a/v2/src/app/app.js
+++ b/v2/src/app/app.js
@@ -9,7 +9,7 @@ var app = angular.module('compass', [
     'compass.server',
     'ui.router',
     'ui.bootstrap',
-    //'compassAppDev',
+  //  'compassAppDev',
     'ngAnimate'
 ]);
 
diff --git a/v2/src/app/cluster/cluster-create.tpl.html b/v2/src/app/cluster/cluster-create.tpl.html
index c083954..5f8a0d6 100644
--- a/v2/src/app/cluster/cluster-create.tpl.html
+++ b/v2/src/app/cluster/cluster-create.tpl.html
@@ -62,7 +62,7 @@
         </form>
     </div>
     <div class="modal-footer">
-        <button class="btn btn-default" ng-click="cancel()">Cancel</button>
+        <button class="btn btn-default btn-cancel" ng-click="cancel()">Cancel</button>
         <button class="btn btn-primary" ng-click="ok()" ng-disabled="createClusterForm.$invalid">Create</button>
     </div>
 </script>
diff --git a/v2/src/app/cluster/cluster-overview.tpl.html b/v2/src/app/cluster/cluster-overview.tpl.html
index c773228..433f285 100644
--- a/v2/src/app/cluster/cluster-overview.tpl.html
+++ b/v2/src/app/cluster/cluster-overview.tpl.html
@@ -143,14 +143,14 @@
                     </table>
                     <script type="text/ng-template" id="deleteHostConfirm.html">
                         <div class="modal-header ng-scope">
-                        <h3 class="modal-title">Create Cluster</h3>
+                        <h3 class="modal-title">Delete Cluster</h3>
                         </div>
                         <div class="modal-body"  style="padding-top: 30px; padding-bottom: 20px;" >
                             Are you sure to delete
                             <strong>{{host.name}}</strong>?
                         </div>                       
                         <div class="modal-footer">
-                            <button class="btn btn-default" ng-click="cancel()">Cancel</button>
+                            <button class="btn btn-default btn-cancel" ng-click="cancel()">Cancel</button>
                             <button class="btn btn-primary" ng-click="ok()">OK</button>
                         </div>
                     </script>
diff --git a/v2/src/app/monitoring/overview.tpl.html b/v2/src/app/monitoring/overview.tpl.html
index 1f29366..42bea87 100644
--- a/v2/src/app/monitoring/overview.tpl.html
+++ b/v2/src/app/monitoring/overview.tpl.html
@@ -15,6 +15,9 @@
 		</em>
 		<br>
 			Cluster Summary
+		<!--<span class="pull-right">
+			<image src="assets/img/smile_face.png" width="20" height="20">
+		</span>-->
 		</a>
 		</li>
 		<li>
diff --git a/v2/src/app/wizard/wizard.tpl.html b/v2/src/app/wizard/wizard.tpl.html
index 3e445ff..cbadf1e 100644
--- a/v2/src/app/wizard/wizard.tpl.html
+++ b/v2/src/app/wizard/wizard.tpl.html
@@ -56,13 +56,13 @@
 </div>
 <div>
     <script type="text/ng-template" id="messagemodal.html">
-        <div class="modal-header">
+        <div class="modal-header modal-warning-header">
             <h3 class="modal-title">
                 <i class="ace-icon fa fa-exclamation-triangle orange"></i>
                 Warning
             </h3>
         </div>
-        <div class="modal-body">
+        <div class="modal-body modal-warning-body">
             <span ng-if="warning.message">
                 {{warning.message}}
             </span>
@@ -70,8 +70,8 @@
                 Error occured.
             </span>
         </div>
-        <div class="modal-footer">
-            <button class="btn btn-primary" ng-click="ok()">OK</button>
+        <div class="modal-footer modal-warning-footer">
+            <button class="btn btn-primary" ng-click="ok()" style="padding-left: 25px; padding-right: 25px; margin-left: 0px; margin-right: -3px;" >OK</button>
         </div>
     </script>
 </div>
diff --git a/v2/src/common/findservers/find-new-servers.tpl.html b/v2/src/common/findservers/find-new-servers.tpl.html
index 10f88a2..59337d0 100644
--- a/v2/src/common/findservers/find-new-servers.tpl.html
+++ b/v2/src/common/findservers/find-new-servers.tpl.html
@@ -80,10 +80,10 @@
                     </td>
                     <td>
                         <span ng-if="switch.result == 'success'">
-                            <i class="ace-icon fa fa-smile-o bigger-125 green"></i>
+                            <i class="ace-icon fa fa-check bigger-125 green"></i>
                         </span>
                         <span ng-if="switch.result == 'error'">
-                            <i class="ace-icon fa fa-frown-o bigger-125 red"></i>
+                            <i class="ace-icon fa fa-times bigger-125 red"></i>
                         </span>
                         <span ng-if="isFindingNewServers && switch.selected && !switch.finished">
                             <i class="ace-icon fa fa-spinner fa-spin bigger-125 orange"></i>