diff --git a/app/controllers/settings/menu_item_instances_controller.rb b/app/controllers/settings/menu_item_instances_controller.rb
index 775be176..97115e4e 100644
--- a/app/controllers/settings/menu_item_instances_controller.rb
+++ b/app/controllers/settings/menu_item_instances_controller.rb
@@ -16,22 +16,12 @@ class Settings::MenuItemInstancesController < ApplicationController
 
   # GET /settings/menu_item_instances/new
   def new
-    if params[:simple_menu_item_id]
-        @aa  = MenuItem.find(params[:simple_menu_item_id])
-      else
-        @aa  = MenuItem.find(params[:set_menu_item_id])
-      end
     @category = MenuCategory.find(@item.menu_category_id)
     @settings_menu_item_instances = MenuItemInstance.new
   end
 
   # GET /settings/menu_item_instances/1/edit
   def edit
-    if params[:simple_menu_item_id]
-        @aa  = MenuItem.find(params[:simple_menu_item_id])
-      else
-        @aa  = MenuItem.find(params[:set_menu_item_id])
-      end
     @category = MenuCategory.find(@item.menu_category_id)
   end
 
@@ -51,6 +41,8 @@ class Settings::MenuItemInstancesController < ApplicationController
     category = MenuCategory.find(catID.menu_category_id)
     respond_to do |format|
       if @settings_menu_item_instances.save
+        @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes]
+        @settings_menu_item_instances.save
         format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully created.' }
         format.json { render :show, status: :created, location: @settings_menu_item_instances }
       else
@@ -63,6 +55,8 @@ class Settings::MenuItemInstancesController < ApplicationController
   # PATCH/PUT /settings/menu_item_instances/1
   # PATCH/PUT /settings/menu_item_instances/1.json
   def update
+    puts "params[:menu_item_instance][:item_attributes]"
+    puts params[:menu_item_instance][:item_attributes]
     if params[:simple_menu_item_id]
       catID  = MenuItem.find(params[:simple_menu_item_id])
     else
@@ -70,7 +64,10 @@ class Settings::MenuItemInstancesController < ApplicationController
     end
     category = MenuCategory.find(catID.menu_category_id)
     respond_to do |format|
+
       if @settings_menu_item_instances.update(settings_menu_item_instance_params)
+        @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].reject(&:blank?)
+        @settings_menu_item_instances.save
         format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully updated.' }
         format.json { render :show, status: :ok, location: @settings_menu_item_instances }
       else
@@ -112,6 +109,6 @@ class Settings::MenuItemInstancesController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_menu_item_instance_params
-      params.require(:menu_item_instance).permit(:item_instance_code, :item_instance_name, :price, :is_on_promotion, :promotion_price, :is_available,:menu_category_id,:menu_item_id)
+      params.require(:menu_item_instance).permit(:item_instance_code, :item_instance_name, :price, :item_attributes, :is_on_promotion, :promotion_price, :is_available,:menu_category_id,:menu_item_id)
     end
 end
diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb
index e0cf0d08..46fcb54d 100644
--- a/app/controllers/settings/order_queue_stations_controller.rb
+++ b/app/controllers/settings/order_queue_stations_controller.rb
@@ -4,7 +4,7 @@ class Settings::OrderQueueStationsController < ApplicationController
   # GET /settings/order_queue_stations
   # GET /settings/order_queue_stations.json
   def index
-    @settings_order_queue_stations = OrderQueueStation.all
+    @settings_order_queue_stations = OrderQueueStation.all.active
   end
 
   # GET /settings/order_queue_stations/1
@@ -40,6 +40,7 @@ class Settings::OrderQueueStationsController < ApplicationController
   # PATCH/PUT /settings/order_queue_stations/1
   # PATCH/PUT /settings/order_queue_stations/1.json
   def update
+    params[:order_queue_station][:processing_items] = params[:order_queue_station][:processing_items].split(/,/).inspect
     respond_to do |format|
       if @settings_order_queue_station.update(settings_order_queue_station_params)
         format.html { redirect_to settings_order_queue_station_path(@settings_order_queue_station), notice: 'Order queue station was successfully updated.' }
diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb
index d2083e59..08186297 100644
--- a/app/controllers/settings/simple_menu_items_controller.rb
+++ b/app/controllers/settings/simple_menu_items_controller.rb
@@ -78,6 +78,6 @@ class Settings::SimpleMenuItemsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_menu_item_params
-      params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
+      params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id,:item_attributes, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
     end
 end
diff --git a/app/models/menu_item_attribute.rb b/app/models/menu_item_attribute.rb
index ebaa060e..a2fd0d1c 100644
--- a/app/models/menu_item_attribute.rb
+++ b/app/models/menu_item_attribute.rb
@@ -1,4 +1,6 @@
 class MenuItemAttribute < ApplicationRecord
   validates_presence_of :attribute_type, :name, :value
-  
+  def self.collection
+    MenuItemAttribute.select("id, name").map { |e| [e.name, e.id] }
+  end
 end
diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb
index 88430b51..21f2ba37 100644
--- a/app/views/settings/menu_categories/show.html.erb
+++ b/app/views/settings/menu_categories/show.html.erb
@@ -37,7 +37,6 @@
 </div>
 
 <br>
-<% if @settings_menu_category.menu_items.count > 0 %>
 <div class="card">
   <div class="card-block">
     <h4 class="card-title">Menu Items
@@ -86,5 +85,4 @@
     </table>
 
   </div>
-<% end %>
 </div>
\ No newline at end of file
diff --git a/app/views/settings/menu_item_instances/_form.html.erb b/app/views/settings/menu_item_instances/_form.html.erb
index e2751fee..759aec65 100644
--- a/app/views/settings/menu_item_instances/_form.html.erb
+++ b/app/views/settings/menu_item_instances/_form.html.erb
@@ -5,7 +5,7 @@
     <%= f.input :item_instance_code %>
     <%= f.input :item_instance_name %>
     <%= f.input :price %>
-    
+    <%= f.input :item_attributes, collection: MenuItemAttribute.collection, input_html: { multiple: true } %>
 
     <%= f.input :is_on_promotion %>
     <%= f.input :promotion_price %>
diff --git a/app/views/settings/menu_item_instances/show.html.erb b/app/views/settings/menu_item_instances/show.html.erb
index 44c84be4..4474d567 100644
--- a/app/views/settings/menu_item_instances/show.html.erb
+++ b/app/views/settings/menu_item_instances/show.html.erb
@@ -34,7 +34,7 @@
           <td><%= @settings_menu_item_instances.is_on_promotion %></td>
           <td><%= @settings_menu_item_instances.promotion_price %></td>
           <td><%= @settings_menu_item_instances.is_available %></td>
-          <td><%=l @settings_menu_item_instances.created_at, format: :short %></td>
+          <td><%= @settings_menu_item_instances.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
           <% if params[:simple_menu_item_id] %>
           <td><%= link_to 'Edit', edit_settings_simple_menu_item_menu_item_instance_path(@item,@settings_menu_item_instances) %></td>
           <% else %>
diff --git a/app/views/settings/menus/show.html.erb b/app/views/settings/menus/show.html.erb
index 28efe8af..b318be63 100644
--- a/app/views/settings/menus/show.html.erb
+++ b/app/views/settings/menus/show.html.erb
@@ -32,7 +32,7 @@
             <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.created_by %></td>
-            <td><%=l @settings_menu.created_at, format: :short %></td>
+            <td><%= @settings_menu.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
             <td><%= link_to 'Edit', edit_settings_menu_path(@settings_menu) %></td>
           </tr>
       </tbody>
diff --git a/app/views/settings/set_menu_items/new.html.erb b/app/views/settings/set_menu_items/new.html.erb
index 6c7b6e76..c7d277bf 100644
--- a/app/views/settings/set_menu_items/new.html.erb
+++ b/app/views/settings/set_menu_items/new.html.erb
@@ -1,8 +1,6 @@
 <!-- <h1>New Settings Menu Item</h1>
 
-<%= render 'form', settings_menu_item: @settings_menu_item %>
-
-<%= link_to 'Back', settings_menu_items_path %> -->
+<%= render 'form', settings_menu_item: @settings_menu_item %> -->
 
 
 <div class="span12">
diff --git a/app/views/settings/set_menu_items/show.html.erb b/app/views/settings/set_menu_items/show.html.erb
index c0aeca31..2365c310 100644
--- a/app/views/settings/set_menu_items/show.html.erb
+++ b/app/views/settings/set_menu_items/show.html.erb
@@ -100,7 +100,7 @@
   <div class="card-block">
     <h4 class="card-title">Menu Item Instances
       <span style="float: right">
-        <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_item_menu_item_instance_path(@settings_menu_item),:class => 'btn btn-primary btn-sm' %>
+        <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_set_menu_item_menu_item_instance_path(@settings_menu_item),:class => 'btn btn-primary btn-sm' %>
       </span>
 
     </h4>
@@ -129,6 +129,9 @@
             <td><%= settings_menu_item.is_on_promotion %></td>
             <td><%= settings_menu_item.promotion_price %></td>
             <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p")  %></td> 
+            <td><%= link_to 'Show', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ) %></td>
+            <td><%= link_to 'Edit', edit_settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item) %></td>
+            <td><%= link_to 'Destroy', settings_set_menu_item_menu_item_instance_path(@settings_menu_item, settings_menu_item ), method: :delete, data: { confirm: 'Are you sure?' } %></td> 
           </tr>
         <% end %>
       </tbody>
diff --git a/app/views/settings/simple_menu_items/new.html.erb b/app/views/settings/simple_menu_items/new.html.erb
index 2f3cb6a4..5781850d 100644
--- a/app/views/settings/simple_menu_items/new.html.erb
+++ b/app/views/settings/simple_menu_items/new.html.erb
@@ -1,8 +1,6 @@
 <!-- <h1>New Settings Menu Item</h1>
 
-<%= render 'form', settings_menu_item: @settings_menu_item %>
-
-<%= link_to 'Back', settings_menu_items_path %> -->
+<%= render 'form', settings_menu_item: @settings_menu_item %>-->
 
 
 <div class="span12">
diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb
index 878cd2e5..6e93d3cc 100644
--- a/app/views/settings/simple_menu_items/show.html.erb
+++ b/app/views/settings/simple_menu_items/show.html.erb
@@ -3,7 +3,7 @@
  <ul class="breadcrumb">
   <li><a href="<%=  %>">Home</a></li>
   <li><a href="<%= settings_menu_category_simple_menu_items_path(@category) %>">Menu Category</a></li>
-  <li>Menu Item Option</li>
+  <li>Menu Item</li>
   <span style="float: right">
   </span>
  </ul>