diff --git a/app/controllers/crm/bookings_controller.rb b/app/controllers/crm/bookings_controller.rb
index efaa5419..d712f66f 100644
--- a/app/controllers/crm/bookings_controller.rb
+++ b/app/controllers/crm/bookings_controller.rb
@@ -1,4 +1,4 @@
-class Crm::BookingsController < BaseCrmController
+class Crm::BookingsController < ApplicationController
 	load_and_authorize_resource
 	def update_booking
         booking = Booking.find(params[:booking_id])
diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 2a0626dd..0573b67f 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -1,4 +1,4 @@
-class Crm::CustomersController < BaseCrmController
+class Crm::CustomersController < ApplicationController
   load_and_authorize_resource except: [:create]
   before_action :set_crm_customer, only: [:show, :edit, :update, :destroy]
 
diff --git a/app/controllers/crm/dining_queues_controller.rb b/app/controllers/crm/dining_queues_controller.rb
index a48e03a7..6c093ace 100644
--- a/app/controllers/crm/dining_queues_controller.rb
+++ b/app/controllers/crm/dining_queues_controller.rb
@@ -1,4 +1,4 @@
-class Crm::DiningQueuesController < BaseCrmController
+class Crm::DiningQueuesController < ApplicationController
   load_and_authorize_resource
   before_action :set_dining_queue, only: [:show, :edit, :update, :destroy]
 
diff --git a/app/controllers/crm/home_controller.rb b/app/controllers/crm/home_controller.rb
index 012f2bc6..92b31261 100644
--- a/app/controllers/crm/home_controller.rb
+++ b/app/controllers/crm/home_controller.rb
@@ -1,4 +1,4 @@
-class Crm::HomeController < BaseCrmController
+class Crm::HomeController < ApplicationController
   def index
   	 
   	   @booking  = Booking.all
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 3c087aa9..85733e8b 100644
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -1,4 +1,4 @@
-class Oqs::EditController < BaseOqsController
+class Oqs::EditController < ApplicationController#BaseOqsController
   def index
   	assigned_item_id = params[:id]
     assigned_item = AssignedOrderItem.find(assigned_item_id)
diff --git a/app/controllers/oqs/home_controller.rb b/app/controllers/oqs/home_controller.rb
index af843c7e..561b0552 100644
--- a/app/controllers/oqs/home_controller.rb
+++ b/app/controllers/oqs/home_controller.rb
@@ -1,4 +1,4 @@
-class Oqs::HomeController < BaseOqsController
+class Oqs::HomeController < ApplicationController#BaseOqsController
   def index
 
   	@queue_stations = OrderQueueStation.all
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index ca5404ec..757a3681 100644
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -21,10 +21,10 @@
             <thead>
 
               <tr>
-                 <td colspan="6">
+                 <td colspan="7">
                     <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
                       <div class="input-append col-md-7 form-group pull-left">
-                        <input type="text" name="filter" style="margin-right:10px" placeholder="Search" id="search" class="form-control input-xs col-md-9">
+                        <input type="text" name="filter" style="margin-right:5px" placeholder="Search" id="search" class="form-control input-xs col-md-9">
                         <input type="hidden" name="type" id="type" value="">
                         <button type="submit" class="btn btn-primary btn-md">Search</button>
                         <!-- <a href="modal-window" data-toggle= "modal" data-target="#modal-window" class="btn btn-primary btn-md" id="card_read" >Read Card</a> -->
@@ -87,7 +87,7 @@
     <div class="col-lg-1 col-md-1 col-sm-1">
     <br>
        <a href="<%= dashboard_path%>" class="btn btn-primary">
-        <i class="fa fa-arrow-left fa-lg"></i> Back
+       Back
        </a>
     </div>
 </div>
diff --git a/app/views/layouts/_sidebar.html.erb b/app/views/layouts/_sidebar.html.erb
index 49571e18..571e7632 100644
--- a/app/views/layouts/_sidebar.html.erb
+++ b/app/views/layouts/_sidebar.html.erb
@@ -4,7 +4,14 @@
     <li><%= link_to "Dashboard ", dashboard_path,:class =>"" %> </li>
     <li><%= link_to "OQS ", oqs_root_path,:class =>"" %></li>
     <li><%= link_to "Cashier ", origami_root_path,:class =>"" %></li>
-    <li><%= link_to "CRM ", crm_customers_path,:class =>"" %></li>
+    <li>
+      <div class="link">CRM<i class="fa fa-chevron-down"></i>
+      </div>
+      <ul class="submenu">
+        <li> <%= link_to "Customer ", crm_customers_path,:class =>"" %></li>
+        <li> <%= link_to "Queue ", crm_dining_queues_path,:class =>"" %></li>
+      </ul>
+    </li>
     <li><%= link_to "Inventory ", inventory_path,:class =>"" %></li>
     <li class="header"><a>Settings</a></li>
     <li><%= link_to "Zones ", settings_zones_path,:class =>"" %></li>
@@ -19,15 +26,6 @@
         <li> <%= link_to "Credit Note ", transactions_credit_notes_path,:class =>"m" %></li>
       </ul>
     </li>
-    <li>
-      <div class="link">Blalalal<i class="fa fa-chevron-down"></i>
-      </div>
-      <ul class="submenu">
-        <li> <%= link_to "Orders ", transactions_orders_path,:class =>"" %></li>
-        <li> <%= link_to "Sales ", transactions_sales_path,:class =>"" %></li>
-        <li> <%= link_to "Credit Note ", transactions_credit_notes_path,:class =>"m" %></li>
-      </ul>
-    </li>
     <li><%= link_to "Cashier Terminal ", settings_cashier_terminals_path,:class =>"" %></li>
     <li><%= link_to "Print Settings ", print_settings_path,:class =>"" %></li>
     <li><%= link_to "Staff ", settings_employees_path,:class =>"" %></li>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 2cc480a2..dac05832 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -11,12 +11,28 @@
 
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= stylesheet_link_tag    'settings', media: 'all', 'data-turbolinks-track': 'reload' %>
+
+    <!-- oqs -->
+    <%= stylesheet_link_tag    'OQS', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <!-- crm -->
+    <%= stylesheet_link_tag    'CRM', media: 'all', 'data-turbolinks-track': 'reload' %>    
+
     <%= stylesheet_link_tag    'fileinput.min', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= stylesheet_link_tag    'sx-sidebar', media: 'all', 'data-turbolinks-track': 'reload' %>
-    
+  <!-- JS -->  
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> 
+    <!-- oqs -->
+    <%= javascript_include_tag 'OQS', 'data-turbolinks-track': 'reload' %>
+    <!-- crm -->
+    <%= javascript_include_tag 'CRM', 'data-turbolinks-track': 'reload' %>
+    <%= stylesheet_link_tag    'jquery-confirm', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= javascript_include_tag 'jquery-confirm', 'data-turbolinks-track': 'reload' %>
+
     <%= javascript_include_tag 'fileinput.min', 'data-turbolinks-track': 'reload' %>      
-    <%= javascript_include_tag 'popper.min', 'data-turbolinks-track': 'reload' %> 
+    
+
+
+    
   </head>
 
   <body>
@@ -32,10 +48,11 @@
             alert = "alert-danger"
           end
         %>
+            <% if !flash["errors"]%>
 						  <div class="alert <%=alert%> fade-in">
-						    <button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>
-						    <%= message %>
+						    <button class="close" aria-hidden="true" data-dismiss="alert" type="button">×</button>			<%=message%>
 						  </div>
+            <% end %>
 			<% end %>
       <div id="wrapper">
         <!-- Sidebar -->