diff --git a/.gitignore b/.gitignore
index eadc1489..66f5a09c 100755
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,7 @@ capybara-*.html
 /public/image
 /public/system/*
 /public/assets/*
+/public/menus/*
 /public/uploads/*
 /public/swf/*
 /public/receipts/
diff --git a/app/models/menu.rb b/app/models/menu.rb
index 6d7e9cbe..60200aeb 100755
--- a/app/models/menu.rb
+++ b/app/models/menu.rb
@@ -182,7 +182,7 @@ class Menu < ApplicationRecord
               account = Account.create({title: row["Account"], account_type: "0"})
             end
 
-            menu_itm = MenuItem.create(item_code: row["Item Code"], name: row["Item Name"], account_id: account.id, alt_name: row["Item AltName"], image_path: "", description: '', information: '', unit: '', type: "SimpleMenuItem", menu_category_id: menu_cat.id, item_attributes: item_attrs, item_options: item_opts, is_sub_item: 0, is_available: 1, created_by: created_by)
+          menu_itm = MenuItem.create(item_code: row["Item Code"], name: row["Item Name"], account_id: account.id, alt_name: row["Item AltName"], image_path: "", description: '', information: '', unit: '', type: "SimpleMenuItem", menu_category_id: menu_cat.id, item_attributes: item_attrs, item_options: item_opts, is_sub_item: 0, is_available: 1, created_by: created_by)
           # else
           #   status = status + "Item Code already exists for " + row["Item Name"] + "."
           end
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index f31341d9..0641a6a3 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -434,15 +434,14 @@
       </div>
       <div class="modal-footer ">
         <div class="row m-b-10 m-r-30">          
-          <div class="col-md-5 m-r-20">            
+          <div class="col-md-5 m-r-15">            
               <button type="button" class="btn btn-link bg-red waves-effect print_receipt">Print</button>            
           </div>
           
-          <div class="col-md-5 m-r-20">
+          <div class="col-md-5 m-r-13">
             <button type="button" class="btn btn-link bg-blue waves-effect btn_pdf_close" data-dismiss="modal">CLOSE</button>
           </div>
         </div>
-        
       </div>
     </div>
   </div>
diff --git a/app/views/settings/employees/_form.html.erb b/app/views/settings/employees/_form.html.erb
index 0b973416..ad50e9b8 100755
--- a/app/views/settings/employees/_form.html.erb
+++ b/app/views/settings/employees/_form.html.erb
@@ -7,7 +7,11 @@
 
         <div class="form-inputs p-l-15">
           <%= f.input :name %>
-          <%= f.input :role, :collection => Lookup.collection_of("employee_roles"),:class=>'form-group' %>
+          <% if current_user.role == "administrator" %>
+            <%= f.input :role, :collection => Lookup.collection_of("employee_roles"),:class=>'form-group' %>
+          <% else %>
+            <%= f.input :role, :collection => Lookup.collection_of("employee_roles").select{|r| r[1] != "administrator"},:class=>'form-group' %>
+          <% end %>
           <%= f.input :emp_id,  :label => "Employee Numberic ID (*Unique)" %>
           <%= f.input :password %>