diff --git a/app/models/sale.rb b/app/models/sale.rb
index 3c97dbf8..af2df171 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1060,7 +1060,7 @@ end
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
                       "and payment_status='paid' and sale_status= 'completed'")
                 .group('mi.name')
-                .order("SUM(i.qty) DESC").limit(10)
+                .order("SUM(i.qty) DESC").limit(20)
   end
 
   def self.bottom_products(today)
@@ -1070,7 +1070,7 @@ end
                 .where("(i.qty > 0 and i.price > 0) and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'"+
                       "and payment_status='paid' and sale_status= 'completed'")
                 .group('mi.name')
-                .order("SUM(i.qty) ASC").limit(10)
+                .order("SUM(i.qty) ASC").limit(20)
   end
 
   def self.hourly_sales(today)
diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb
index 4056e064..f935522b 100755
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -15,7 +15,6 @@
       delimiter = ""
     end
   %> 
-  <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
   <!-- Widgets -->
   <div class="row clearfix">
     <div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
@@ -64,10 +63,17 @@
       </div>
     </div>
   </div>
-  <% end %>
   <!-- #END# Widgets -->
   <!-- CPU Usage -->
 
+  <!-- Date range for dashboard -->
+  <div class="row">
+    <div class="col-lg-12 col-md-12 col-sm-12">
+      
+    </div>
+  </div>
+  <!-- Date range for dashboard -->
+
   <div class="row">
     <% if current_user.role == 'administrator' || current_user.role == 'manager' %>
     <div class="col-xs-8 col-sm-8 col-md-8 col-lg-8">
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 6e1f7128..386a142f 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -411,8 +411,10 @@
              <%= t("views.btn.back") %>
           </button>
           <button type="button" id="add_order" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.add") %> <%= t("views.right_panel.detail.order") %></button>
-          <% if current_login_employee.role != "waiter" %>
+          <% if current_login_employee.role == "administrator" || current_login_employee.role == "manager" || current_login_employee.role == "supervisor" || current_login_employee.role == "cashier" || current_login_employee.role == "waiter" %>
           <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
+          <% end %>
+          <% if current_login_employee.role != "waiter" %>
           <% if @dining.status != "available" %> 
               <% if @status_order == 'order' && @status_sale != 'sale' %>
                   <button type="button" id="customer" class="btn btn-block bg-blue waves-effect" >Customer</button>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 17674fff..de774e2b 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -382,7 +382,10 @@
    <!-- Waiter Buttons -->
    <button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i> Back</button>
    <button type="button" id="add_order" class="btn btn-block btn- bg-blue waves-effect">Add Order</button>
+   <% if current_login_employee.role == "administrator" || current_login_employee.role == "manager" || current_login_employee.role == "supervisor" || current_login_employee.role == "cashier" || current_login_employee.role == "waiter" %>
    <button type="button" id="survey" class="btn btn-block bg-blue waves-effect">Survey</button>
+   <% end %>
+   <% if current_login_employee.role != "waiter" %>
    <% if @room.bookings.length >= 1 %>
      <% if @status_order == 'order' && @status_sale != 'sale' %>
        <!-- <button type="button" class="btn bg-blue btn-block" >Add Order</button> -->
@@ -453,6 +456,7 @@
 
    <!-- <button type="button" id="re-print" class="btn bg-blue btn-block" >Re.Print</button> -->
    <% end %>
+   <% end %>
  </div>
 </div>
 </div>