diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index 0fdec437..36e021b2 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -25,10 +25,7 @@ $(document).on('turbolinks:load', function() {
   $('.delete').click(function(){
     var method    = $(this).attr('data-method');
     var url       = $(this).attr('data-ref');
-    var html_text = $( this ).siblings( "#delete_text" ).html();
-    console.log(method);
-    console.log(url);
-    console.log(html_text);
+    var html_text = $(this).siblings( "#delete_text" ).html();
     swal({
         title: "Confirmation",
         text: html_text,
diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css
index eae4b190..15ac5ea3 100644
--- a/app/assets/stylesheets/reset.css
+++ b/app/assets/stylesheets/reset.css
@@ -226,5 +226,13 @@ section.content {
 }
 /* END FORM */
 
+.form-group span.help-block {
+    font-size: 12px;
+    display: block;
+    margin-top: 5px;
+    font-weight: normal;
+    color: #F44336;
+}
+
 /* End Reset Theme */
 /* *************************************************** */
\ No newline at end of file
diff --git a/app/controllers/settings/accounts_controller.rb b/app/controllers/settings/accounts_controller.rb
index 54f27480..549d5887 100755
--- a/app/controllers/settings/accounts_controller.rb
+++ b/app/controllers/settings/accounts_controller.rb
@@ -27,7 +27,7 @@ class Settings::AccountsController < ApplicationController
   def create
     @settings_account = Account.new(account_params)
     respond_to do |format|
-      if @settings_account.save!
+      if @settings_account.save
         format.html { redirect_to settings_accounts_url, notice: 'Account was successfully created.' }
         format.json { render :index, status: :created, location: @settings_account }
       else
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index 76d51afc..da084d32 100755
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -167,12 +167,12 @@
 					<span><%= t :payment_methods %></span>
 				</a>
 			</li>
-			<li>
+			<!-- <li>
 				<a href="<%= settings_accounts_path %>">
 					<i class="material-icons col-amber">donut_large</i>
 					<span><%= t :accounts %></span>
 				</a>
-			</li>
+			</li> -->
 			<li>
 				<a href="<%= settings_products_path %>">
 					<i class="material-icons col-brown">donut_large</i>
diff --git a/app/views/settings/accounts/_form.html.erb b/app/views/settings/accounts/_form.html.erb
index b860bf48..035a48a5 100755
--- a/app/views/settings/accounts/_form.html.erb
+++ b/app/views/settings/accounts/_form.html.erb
@@ -3,8 +3,8 @@
    <%= simple_form_for([:settings,@settings_account]) do |f| %>
    <%= f.error_notification %>
    <div class="form-inputs p-l-10">
-    <%= f.input :title ,:input_html=>{:class=>"col-md-10"}%>
-    <%= f.input :account_type, :collection => Lookup.collection_of("account_type"),:input_html=>{:class=>"col-md-10"} %>
+    <%= f.input :title ,:input_html=>{:class=>"col-md-10"},:required=>true%>
+    <%= f.input :account_type, :collection => Lookup.collection_of("account_type"),:input_html=>{:class=>"col-md-10"},:required=>true %>
     <%= f.input :discount %>
     <%= f.input :point %>
     <%= f.input :bonus %>
diff --git a/app/views/settings/menu_categories/show.html.erb b/app/views/settings/menu_categories/show.html.erb
index c35db563..594f8faf 100755
--- a/app/views/settings/menu_categories/show.html.erb
+++ b/app/views/settings/menu_categories/show.html.erb
@@ -10,110 +10,111 @@
 </div>
 
 <div class="row">
-    <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
-     <div class="card">
+  <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
+   <div class="card">
      <ul class="list-group">
-     <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
-      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
-      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
-      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
-      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
-      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
-    </ul>
+       <li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
+       <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
+       <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+       <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+       <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+       <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+       <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
+     </ul>
+   </div>
+ </div>
+ <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
+  <div class="card">
+    <div class="card-block">
+      <h4 class="card-title">Menu Category</h4>
+      <table class="table">
+        <thead>
+          <tr>
+            <th>Menu</th>
+            <th>Name</th>
+            <th>Alt name</th>
+            <th>Available</th>
+            <!-- <th>Order by</th> -->
+            <th>Created At</th>
+            <th>Actions</th>
+          </tr>
+        </thead>
+
+        <tbody>
+          <tr>
+            <td><%= @settings_menu_category.menu.name %></td>
+            <td><%= @settings_menu_category.name  rescue "-" %></td>
+            <td><%= @settings_menu_category.alt_name %></td>
+            <td><%= settings_menu_category.is_available rescue false%></td>
+            <!-- <td><%= @settings_menu_category.order_by %></td> -->
+            <td><%= @settings_menu_category.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></td>
+            <td><%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category),:class => 'btn btn-primary btn-sm waves-effect' %>
+              
+              <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_path(@settings_menu_category)%>" data-method="delete">
+                <%= t("views.btn.delete") %>
+              </button>
+
+              <span class="hidden" id="delete_text">
+                <h6>Are you sure you want to delete this row ?</h6>
+                <h6>This action can't be undo. </h6> 
+              </span>
+            </td>
+          </tr>
+        </tbody>
+      </table>
     </div>
   </div>
-  <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
-    <div class="card">
-      <div class="card-block">
-        <h4 class="card-title">Menu Category</h4>
+
+  <div class="card">
+    <div class="card-block">
+      <h4 class="card-title">Menu Items
+        <span style="float: right">
+          <%= link_to "New Simple Menu Item",new_settings_menu_category_simple_menu_item_path(@settings_menu_category),:class => 'btn btn-primary btn-sm' %>
+          <%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@settings_menu_category),:class => 'btn btn-primary btn-sm' %>
+
+        </span></h4>
         <table class="table">
           <thead>
             <tr>
-              <th>Menu</th>
+              <th>Item code</th>
               <th>Name</th>
               <th>Alt name</th>
-              <th>Available</th>
-              <!-- <th>Order by</th> -->
-              <th>Created At</th>
+              <th>Type</th>
+              <th>Parent Item</th>
+              <!-- <th>Created by</th> -->
+              <th>Created at</th>
               <th>Actions</th>
             </tr>
           </thead>
-
+          <% settings_menu_items = @settings_menu_category.menu_items %>
           <tbody>
+            <% settings_menu_items.each do |settings_menu_item| %>
             <tr>
-              <td><%= @settings_menu_category.menu.name %></td>
-              <td><%= @settings_menu_category.name  rescue "-" %></td>
-              <td><%= @settings_menu_category.alt_name %></td>
-              <td><%= settings_menu_category.is_available rescue false%></td>
-              <!-- <td><%= @settings_menu_category.order_by %></td> -->
-              <td><%= @settings_menu_category.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></td>
-              <td><%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu_category, @settings_menu_category),:class => 'btn btn-primary btn-sm waves-effect' %>
-              
-                <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_menu_category_path(@settings_menu_category)%>" data-method="delete">
-                  <%= t("views.btn.delete") %>
-                </button>
+              <td><%= settings_menu_item.item_code %></td>
+              <td><%= settings_menu_item.name %></td>
+              <td><%= settings_menu_item.alt_name %></td>
+              <td><%= settings_menu_item.type %></td>
+              <td><%= settings_menu_item.parent.name rescue "-" %></td>
+              <!-- <td><%= settings_menu_item.created_by %></td> -->
+              <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></td>
 
-                <span class="hidden" id="delete_text">
-                    <h6>Are you sure you want to delete this row ?</h6>
-                    <h6>This action can't be undo. </h6> 
-                </span>
+              <% if settings_menu_item.type == "SimpleMenuItem" %>
+              <td>
+                <%= link_to 'Show', settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
+                <%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
               </td>
+              <% else %>
+              <td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
+                <%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
+              </td>
+              <% end %>
             </tr>
+            <% end %>
           </tbody>
         </table>
+
       </div>
     </div>
-
-    <div class="card">
-      <div class="card-block">
-        <h4 class="card-title">Menu Items
-          <span style="float: right">
-            <%= link_to "New Simple Menu Item",new_settings_menu_category_simple_menu_item_path(@settings_menu_category),:class => 'btn btn-primary btn-sm' %>
-            <%= link_to "New Set Menu Item",new_settings_menu_category_set_menu_item_path(@settings_menu_category),:class => 'btn btn-primary btn-sm' %>
-
-          </span></h4>
-          <table class="table">
-            <thead>
-              <tr>
-                <th>Item code</th>
-                <th>Name</th>
-                <th>Alt name</th>
-                <th>Type</th>
-                <th>Parent Item</th>
-                <!-- <th>Created by</th> -->
-                <th>Created at</th>
-                <th>Actions</th>
-              </tr>
-            </thead>
-            <% settings_menu_items = @settings_menu_category.menu_items %>
-            <tbody>
-              <% settings_menu_items.each do |settings_menu_item| %>
-              <tr>
-                <td><%= settings_menu_item.item_code %></td>
-                <td><%= settings_menu_item.name %></td>
-                <td><%= settings_menu_item.alt_name %></td>
-                <td><%= settings_menu_item.type %></td>
-                <td><%= settings_menu_item.parent.name rescue "-" %></td>
-                <!-- <td><%= settings_menu_item.created_by %></td> -->
-                <td><%= settings_menu_item.created_at.utc.getlocal.strftime("%Y-%m-%d")  %></td>
-
-                <% if settings_menu_item.type == "SimpleMenuItem" %>
-                <td>
-                    <%= link_to 'Show', settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
-                     <%= link_to t("views.btn.edit"), edit_settings_menu_category_simple_menu_item_path(@settings_menu_category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
-                  </td>
-                <% else %>
-                <td><%= link_to 'Show', settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item ),:class => 'btn btn-info btn-sm waves-effect' %>
-                <%= link_to t("views.btn.edit"), edit_settings_menu_category_set_menu_item_path(@settings_menu_category, settings_menu_item),:class => 'btn btn-primary btn-sm waves-effect' %>
-                </td>
-                <% end %>
-              </tr>
-              <% end %>
-            </tbody>
-          </table>
-
-        </div>
-      </div>
   </div>
   <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
     <div class="card">
@@ -121,48 +122,48 @@
         <h5><%= t("views.right_panel.header.menu_categories") %></h5>
         <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
         <p>
-        1) <%= t("views.right_panel.detail.menu") %> - <%= t("views.right_panel.detail.menu_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
-        2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.menu_categories_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
-        3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.alt_name_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
-        4) <%= t("views.right_panel.detail.is_available") %> - <%= t("views.right_panel.detail.menu_categories_txt") %> <%= t("views.right_panel.detail.status_txt") %> <br>
-        4) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
-        5) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
-        6) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
+          1) <%= t("views.right_panel.detail.menu") %> - <%= t("views.right_panel.detail.menu_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+          2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.menu_categories_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+          3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.alt_name_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+          4) <%= t("views.right_panel.detail.is_available") %> - <%= t("views.right_panel.detail.menu_categories_txt") %> <%= t("views.right_panel.detail.status_txt") %> <br>
+          4) <%= t("views.right_panel.detail.order_by") %> - <%= t("views.right_panel.detail.order_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+          5) <%= t("views.right_panel.detail.created_at") %> - <%= t("views.right_panel.detail.created_at_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
+          6) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
+          2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
         </p>
-      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
-      <p>
-      1) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
-      2) <%= t("views.right_panel.button.delete") %> - <%= t("views.right_panel.detail.delete_btn_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %> <br>
-      </p>
 
-      <h5><%= t("views.right_panel.header.menu_items") %></h5>
-      <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
-      <p>
-      1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
-      2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.menu_item_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
-      3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.alt_name_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
-      4) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
-      5) <%= t("views.right_panel.detail.parent_item") %> - <%= t("views.right_panel.detail.parent_item_txt") %> <br>
-      6) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
-      </p>
-      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
-      <p>
-      1) <%= t("views.right_panel.button.new_simple_menu_item") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.simple_menu_item_txt") %> <br>
-      2) <%= t("views.right_panel.button.new_set_menu_item") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.set_menu_item_txt") %> <br>
-      3) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
-      4) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
-      </p>
-      -----------------------------------------------------------------
-      <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
-      <p>
-        1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
-        2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
-        3) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %><br>
-        4) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
-        5) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
-        6) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
-        7) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
-      </p>
+        <h5><%= t("views.right_panel.header.menu_items") %></h5>
+        <h5><i class="material-icons md-18">view_headline <%= t("views.right_panel.header.page_detail") %></i></h5>
+        <p>
+          1) <%= t("views.right_panel.detail.item_code") %> - <%= t("views.right_panel.detail.code_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+          2) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.menu_item_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <br>
+          3) <%= t("views.right_panel.detail.alt_name") %> - <%= t("views.right_panel.detail.alt_name_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+          4) <%= t("views.right_panel.detail.type") %> - <%= t("views.right_panel.detail.type_txt") %> <%= t("views.right_panel.detail.for") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+          5) <%= t("views.right_panel.detail.parent_item") %> - <%= t("views.right_panel.detail.parent_item_txt") %> <br>
+          6) <%= t("views.right_panel.detail.actions") %> - <%= t("views.right_panel.detail.actions_txt2") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+        </p>
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.button_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.new_simple_menu_item") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.simple_menu_item_txt") %> <br>
+          2) <%= t("views.right_panel.button.new_set_menu_item") %> - <%= t("views.right_panel.detail.create_btn_txt") %> <%= t("views.right_panel.detail.set_menu_item_txt") %> <br>
+          3) <%= t("views.right_panel.button.show") %> - <%= t("views.right_panel.detail.show_btn_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+          4) <%= t("views.right_panel.button.edit") %> - <%= t("views.right_panel.detail.edit_btn_txt") %> <%= t("views.right_panel.detail.menu_item_txt") %> <br>
+        </p>
+        -----------------------------------------------------------------
+        <h5><i class="material-icons md-18">list <%= t("views.right_panel.header.link_lists") %></i> </h5>
+        <p>
+          1) <%= t("views.right_panel.button.home") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          2) <%= t("views.right_panel.button.back") %> - <%= t("views.right_panel.detail.home_txt") %> <br>
+          3) <%= t("views.right_panel.button.menu") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_txt") %><br>
+          4) <%= t("views.right_panel.button.menu_categories") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.menu_categories_txt") %><br>
+          5) <%= t("views.right_panel.button.item_set") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_set_txt") %> <br>
+          6) <%= t("views.right_panel.button.item_attributes") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_attributes_txt") %> <br>
+          7) <%= t("views.right_panel.button.item_options") %> - <%= t("views.right_panel.detail.back_txt") %> <%= t("views.right_panel.detail.item_options_txt") %> <br>
+        </p>
       </div>
     </div>  
   </div>
diff --git a/app/views/settings/menu_item_options/index.html.erb b/app/views/settings/menu_item_options/index.html.erb
index 722a0ec8..ff183343 100755
--- a/app/views/settings/menu_item_options/index.html.erb
+++ b/app/views/settings/menu_item_options/index.html.erb
@@ -11,22 +11,22 @@
 <div class="row">
  <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <div class="card">
-
     <ul class="list-group">
+     <li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
      <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
-      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
-      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
-      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
-      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
-      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
-    </ul>
-  </div>
-</div>
+     <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+     <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+     <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+     <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+     <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
+   </ul>
+   </div>
+ </div>
 <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
   <div class="card">
    <div class="card-block">
-   <h4 class="card-title">Menu Category
-    <%= link_to t("views.btn.new"),new_settings_menu_item_option_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
+     <h4 class="card-title">Menu Category
+      <%= link_to t("views.btn.new"),new_settings_menu_item_option_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
     </h4>
     <hr>
     <table class="table table-striped">
@@ -47,23 +47,23 @@
           <td><%= settings_menu_item_option.value %></td>
           <td>
             <%= link_to t("views.btn.edit"), edit_settings_menu_item_option_path(settings_menu_item_option),:class => 'btn btn-primary btn-sm waves-effect' %>              
-            </td>
-          </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
-    </div>
-  </div>
-  <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
-    <div class="card">
-      <div class="body">
-        Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
-        tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
-        quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
-        consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
-      </div>
-    </div>  
+          </td>
+        </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
 </div>
+</div>
+<div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
+  <div class="card">
+    <div class="body">
+      Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+      tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+      quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+      consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+    </div>
+  </div>  
+</div>
+</div>
 
diff --git a/app/views/settings/menus/index.html.erb b/app/views/settings/menus/index.html.erb
index 4d091ae7..b9139d41 100755
--- a/app/views/settings/menus/index.html.erb
+++ b/app/views/settings/menus/index.html.erb
@@ -12,13 +12,14 @@
    <br><br>
    <div class="card">
     <ul class="list-group">
+     <li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
      <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
-      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
-      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
-      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
-      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
-      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
-    </ul>
+     <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+     <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+     <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+     <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+     <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
+   </ul>
   </div>
 </div>
 <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
diff --git a/app/views/settings/menus/show.html.erb b/app/views/settings/menus/show.html.erb
index 0e2fbf3d..bd86f4f3 100755
--- a/app/views/settings/menus/show.html.erb
+++ b/app/views/settings/menus/show.html.erb
@@ -12,15 +12,14 @@
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <div class="card">
     <ul class="list-group">
-      <ul class="list-group">
+     <li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
      <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
-      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
-      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
-      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
-      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
-      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
-    </ul>
-    </ul>
+     <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+     <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+     <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+     <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+     <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
+   </ul>
   </div>
 </div>
 <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb
index c0c05145..46a78144 100755
--- a/app/views/settings/promotions/_form.html.erb
+++ b/app/views/settings/promotions/_form.html.erb
@@ -149,43 +149,51 @@
         </div>
         <br>
             <div class="card">
+            <div class="p-l-25 p-t-10 ">
               <div class="row">
-                <div class="col-md-4" style="text-align:center">Item Code</div>
-                <div class="col-md-2" style="text-align:center">Min Qty</div>
-                <div class="col-md-2" style="text-align:center">Net off</div>
-                <div class="col-md-2" style="text-align:center">Net Price</div>
-                <div class="col-md-1" style="text-align:center">Percentage</div>
-                <div class="col-md-1" style="text-align:center"></div>
+                <div class="col-md-3" style="text-align:">Item Code</div>
+                <div class="col-md-2" style="text-align:">Item Instance</div>
+                <div class="col-md-1" style="text-align:">Min Qty</div>
+                <div class="col-md-1" style="text-align:">Net off</div>
+                <div class="col-md-2" style="text-align:">Net Price</div>
+                <div class="col-md-2" style="text-align:">Percentage</div>
+                <div class="col-md-1" style="text-align:"></div>
               </div>
               <div class="row"></div >
               <%= f.fields_for :promotion_products do |pro| %>
               <div class="row">
-                <%= pro.hidden_field :item_code,:class => "promo_product" %>
-                <% arr =  MenuItem.active.order("name desc").pluck(:name,:item_code) %>
-                <% Product.order("name desc").pluck(:name,:item_code).each do |p| %>
-                  <% arr.push(p) %>
-                <% end %>
-                <div class="col-md-2 menu_item_choose" style="text-align:left">
-                  <select class="form-control item_code_place1">
-                    <option value="">Choose Something</option>
-                    <% arr.each do |a| %>
-                      <option value="<%= a[1 ]%>"><%= a[0] %></option>
-                    <% end %>
-                  </select>
-                </div>
-                <!-- <% sample = [] %> -->
+                  <%= pro.hidden_field :item_code,:class => "promo_product" %>
+                  <% arr =  MenuItem.active.order("name desc").pluck(:name,:item_code) %>
+                  <% Product.order("name desc").pluck(:name,:item_code).each do |p| %>
+                    <% arr.push(p) %>
+                  <% end %>
+                  <div class="col-md-3 menu_item_choose" style="text-align:">
+                    <select class="form-control item_code_place1">
+                      <option value="">Choose Something</option>
+                      <% arr.each do |a| %>
+                        <option value="<%= a[1 ]%>"><%= a[0] %></option>
+                      <% end %>
+                    </select>
+                  </div>
+                  <!-- <% sample = [] %> -->
 
-                <div class="col-md-2" style="text-align:left"><%= pro.input :item_code, :class => 'promoproduct', collection:[],input_html: { selected: 2 }, label: false %></div>
+                  <div class="col-md-2" style="text-align:">
+                      <%= pro.input :item_code, :class => 'promoproduct', collection:[],input_html: { selected: 2 }, label: false %>
+                  </div>
 
-                <div class="col-md-2"><%= pro.input :min_qty , label: false%></div>
-                <div class="col-md-2"><%= pro.input :net_off , label: false %></div>
-                <div class="col-md-2"><%= pro.input :net_price , label: false %></div>
-                <div class="col-md-1"><%= pro.input :percentage , label: false %></div>
-                <div class="col-md-1" style="text-align:right"><%= pro.link_to_remove "X" %></div>
+                  <div class="col-md-1"><%= pro.input :min_qty , label: false%></div>
+                  <div class="col-md-1"><%= pro.input :net_off , label: false %></div>
+                  <div class="col-md-2"><%= pro.input :net_price , label: false %></div>
+                  <div class="col-md-2"><%= pro.input :percentage , label: false %></div>
+                  <div class="col-md-1" style=""><%= pro.link_to_remove "X" ,:class=>"btn-primary btn m-r-25"%></div>
               </div>
               <% end %>
               <div class="row">
-                <div class="col-md-12" style="text-align:right;"><%= f.link_to_add "Add Product", :promotion_products, :class => 'btn btn-primary addProduct' %></div>
+                <div class="col-md-12" style="text-align:right;margin-right: 
+                10px;">
+                <%= f.link_to_add "Add Product", :promotion_products, :class => 'btn bg-teal addProduct m-r-20' %> 
+                </div>
+              </div>
               </div>
             </div>
     </div>
@@ -193,7 +201,7 @@
 
   <br>
   <div class="form-actions">
-    <%= f.button :submit %>
+     <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %>
   </div>
 <% end %>
   </div>
diff --git a/app/views/settings/set_menu_items/show.html.erb b/app/views/settings/set_menu_items/show.html.erb
index 134a52bc..e3097acf 100755
--- a/app/views/settings/set_menu_items/show.html.erb
+++ b/app/views/settings/set_menu_items/show.html.erb
@@ -13,13 +13,14 @@
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <div class="card">
     <ul class="list-group">
+     <li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
      <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
-      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
-      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
-      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
-      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
-      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
-    </ul>
+     <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+     <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+     <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+     <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+     <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
+   </ul>
   </div>
 </div>
 <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">
diff --git a/app/views/settings/simple_menu_items/show.html.erb b/app/views/settings/simple_menu_items/show.html.erb
index beb32ddf..5251a56f 100755
--- a/app/views/settings/simple_menu_items/show.html.erb
+++ b/app/views/settings/simple_menu_items/show.html.erb
@@ -14,13 +14,14 @@
   <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
    <div class="card">
     <ul class="list-group">
+     <li class="list-group-item"><%= link_to (t :accounts), settings_accounts_path %></li>
      <li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li> 
-      <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
-      <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
-      <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
-      <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
-      <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
-    </ul>
+     <li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
+     <!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
+     <li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
+     <li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
+     <li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
+   </ul>
   </div>
 </div>
 <div class="col-xs-12 col-sm-12 col-md-7 col-lg-7">