diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb
index 66d75cc4..aad7ae45 100755
--- a/app/controllers/settings/menus_controller.rb
+++ b/app/controllers/settings/menus_controller.rb
@@ -5,7 +5,7 @@ class Settings::MenusController < ApplicationController
   # GET /settings/menus
   # GET /settings/menus.json
   def index
-    @settings_menus = Menu.all.page(params[:page]).per(10)
+    @settings_menus = Menu.unscoped.all.page(params[:page]).per(10)
     respond_to do |format|
       format.html
       format.xlsx
diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb
index ddbb89b6..78a41acb 100755
--- a/app/views/settings/menus/index.html.erb
+++ b/app/views/settings/menus/index.html.erb
@@ -41,6 +41,7 @@
           <th><%= t("views.right_panel.detail.valid_days") %></th>
           <th><%= t("views.right_panel.detail.valid_from") %></th>
           <th><%= t("views.right_panel.detail.valid_to") %></th>
+          <th><%= t("views.right_panel.detail.is_active") %></th>
             <!-- <th>Created By</th>
             <th>Created At</th> -->
 
@@ -55,6 +56,7 @@
             <td><%= settings_menu.valid_days %></td>
             <td><%= settings_menu.valid_time_from.strftime("%H:%M") rescue "-" %></td>
             <td><%= settings_menu.valid_time_to.strftime("%H:%M") rescue "-" %></td>
+            <td><%= settings_menu.is_active %></td>
             <!-- <td><%= settings_menu.created_by %></td> -->
             <!-- <td><%= settings_menu.created_at %></td> -->
             <!-- <td><%= settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td> -->
diff --git a/app/views/settings/rooms/_form.html.erb b/app/views/settings/rooms/_form.html.erb
index d2f43cb0..27ec89a9 100755
--- a/app/views/settings/rooms/_form.html.erb
+++ b/app/views/settings/rooms/_form.html.erb
@@ -7,7 +7,7 @@
 
         <div class="form-inputs p-l-15">
           <%= f.input :name %>
-          <%= f.input :status %>
+          <%= f.input :status, collection: [ ["Available","available"], ["Occupied","occupied"] ], :selected => @settings_room.status %>
           <%= f.input :seater %>
           <%= f.input :order_by %>
           <%= f.input :is_active %>
diff --git a/app/views/settings/tables/_form.html.erb b/app/views/settings/tables/_form.html.erb
index 42ce2d4c..7bbd318e 100755
--- a/app/views/settings/tables/_form.html.erb
+++ b/app/views/settings/tables/_form.html.erb
@@ -7,7 +7,7 @@
 
         <div class="form-inputs p-l-15">
           <%= f.input :name %>
-          <%= f.input :status %>
+          <%= f.input :status, collection: [ ["Available","available"], ["Occupied","occupied"] ], :selected => @settings_table.status %>
           <%= f.input :seater %>
           <%= f.input :order_by %>
           <%= f.input :is_active %>