diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index f9661398..b5511d6e 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -21,7 +21,7 @@
 //= require settings/processing_items
 //= require momentjs/moment
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
-//= require bootstrap-select/js/bootstrap-select
+//= require multi-select/js/jquery.multi-select.js
 //= require jquery-slimscroll/jquery.slimscroll.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
@@ -36,7 +36,7 @@
 
 
 $(document).on('turbolinks:load', function() {
-
+    
     $('.datetimepicker').bootstrapMaterialDatePicker({
         format: 'DD-MM YYYY - HH:mm',
         clearButton: true,
@@ -58,19 +58,10 @@ $(document).on('turbolinks:load', function() {
    
 });
 
-function showConfirmMessage() {
-    swal({
-        title: "Information",
-        text: "You will not be able to recover this imaginary file!",
-        type: "warning",
-        showCancelButton: true,
-        confirmButtonColor: "#DD6B55",
-        confirmButtonText: "OK",
-        closeOnConfirm: true
-    }, function () {
-        swal("Deleted!", "Your imaginary file has been deleted.", "success");
-    });
-}
+ // Material Select Initialization
+ $(document).ready(function() {
+    $('.mdb-select').material_select();
+  });
 
 $(function(){
 
@@ -137,13 +128,12 @@ $(function(){
   });
 
   $('.delete').click(function(){
-    var method = $(this).attr('data-method');
-    var url = $(this).attr('data-ref');
-    var html = $( this ).siblings( "#delete_text" ).html();
-    console.log(html);
+    var method    = $(this).attr('data-method');
+    var url       = $(this).attr('data-ref');
+    var html_text = $( this ).siblings( "#delete_text" ).html();
     swal({
         title: "Confirmation",
-        text: html,
+        text: html_text,
         type: "warning",
         showCancelButton: true,
         confirmButtonColor: "#DD6B55",
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index f29a211a..d40e3c86 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -3,9 +3,9 @@
 @import "node-waves/waves";
 @import "animate-css/animate";
 @import "sweetalert/sweetalert.css";
-@import "multi-select/css/multi-select";
+@import "multi-select/css/multi-select.css";
 @import "bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker";
-@import "bootstrap-select/css/bootstrap-select";
+
 @import "morrisjs/morris";
 @import "fileinput.min";
 @import "BSBMaterial/style";
@@ -62,7 +62,7 @@
 }
 
 section.content {
-  margin: 70px 15px 0 225px;
+  margin: 40px 15px 0 225px;
 }
 
 .sidebar {
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index c9479d2d..a1b797a5 100644
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -9,7 +9,7 @@
   </span>
  </ul>
 </div>
-<br />
+
   <div class="row clearfix">
     <div class="col-lg-8 col-md-8 col-sm-8">
       <!-- <div class="main-box-body clearfix"> -->
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 027f96b8..d14cc505 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -32,15 +32,12 @@ Search Bar -->
             <ul class="dropdown-menu">
                 <li>
                     <%if current_login_employee.role !="waiter" %>
-                    <%= link_to (t :logout),logout_path, method: :delete, data: {confirm: 'Are you sure?'} %>
-                    <%end%>
-                    
-                    <p class="delete" style="" data-ref="<%=logout_path%>" data-method="delete">Logout</p>
+                    <p class="delete  waves-effect waves-block" style="margin:0.5rem 1rem !important;" data-ref="<%=logout_path%>" data-method="delete">Logout</p>
                      <span class="hidden" id="delete_text">
                         <h6>Are you sure you want to Logout ?</h6>
                         <!-- <h6>This action can't be undo. </h6> -->
                     </span>
-                    
+                    <%end%>
                 </li>   
             </ul>
             <a href="javascript:void(0);" class="js-right-sidebar" data-close="true">
@@ -48,10 +45,4 @@ Search Bar -->
             </a>
         </div>
     </div>
-</nav>
-<!-- #Top Bar
-
- <!-- <form action="<%=logout_path%>" method="DELETE">
-                <button type="text" class="delete" value="x" >DELETE</button>
-           </form> -->
-                <!-- <a href="<%= logout_path %>"><i class="material-icons">input</i>Sign Out</a>
\ No newline at end of file
+</nav>
\ No newline at end of file
diff --git a/app/views/settings/employees/_form.html.erb b/app/views/settings/employees/_form.html.erb
index 345a71aa..0a6986e9 100644
--- a/app/views/settings/employees/_form.html.erb
+++ b/app/views/settings/employees/_form.html.erb
@@ -1,5 +1,3 @@
-
-
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
     <%= simple_form_for([:settings,@employee]) do |f| %>
@@ -7,7 +5,7 @@
 
   <div class="form-inputs">
     <%= f.input :name %>
-    <%= f.input :role, :collection => Lookup.collection_of("employee_roles") %>
+    <%= f.input :role, :collection => Lookup.collection_of("employee_roles"),:class=>'form-group' %>
     <%= f.input :emp_id, :as => :integer, :label => "Employee Numberic ID (*Unique)" %>
     <%= f.input :password %>
 
diff --git a/app/views/settings/employees/edit.html.erb b/app/views/settings/employees/edit.html.erb
index 156b0224..dae34a31 100644
--- a/app/views/settings/employees/edit.html.erb
+++ b/app/views/settings/employees/edit.html.erb
@@ -9,5 +9,4 @@
     </span>
   </ol>
 </div>
-
  <%= render 'form', employee: @employee %>
diff --git a/app/views/settings/employees/new.html.erb b/app/views/settings/employees/new.html.erb
index e6757ffc..f3c59410 100644
--- a/app/views/settings/employees/new.html.erb
+++ b/app/views/settings/employees/new.html.erb
@@ -9,5 +9,4 @@
     </span>
   </ol>
 </div>
-
  <%= render 'form', employee: @employee %>
\ No newline at end of file