diff --git a/app/views/settings/accounts/show.html.erb b/app/views/settings/accounts/show.html.erb
index 1f3853d4..a6f84d3b 100755
--- a/app/views/settings/accounts/show.html.erb
+++ b/app/views/settings/accounts/show.html.erb
@@ -2,10 +2,10 @@
 <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-    <li class="breadcrumb-item"><a href="<%= settings_account_path %>">Account</a></li>
+    <li class="breadcrumb-item"><a href="<%= settings_accounts_path %>">Account</a></li>
     <li class="breadcrumb-item active">Details</li>
     <span class="float-right">
-      <%= link_to t('.back', :default => t("views.btn.back")), settings_account_path %>
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_accounts_path %>
     </span>
   </ol>
 </div>
diff --git a/app/views/settings/cashier_terminals/show.html.erb b/app/views/settings/cashier_terminals/show.html.erb
index 62e02b43..b3fa5f58 100755
--- a/app/views/settings/cashier_terminals/show.html.erb
+++ b/app/views/settings/cashier_terminals/show.html.erb
@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_cashier_terminals_path %>">Cashier Terminals</a></li>
     <li class="breadcrumb-item active">Details</li>
     <span class="float-right">
-      <%= link_to t('.back', :default => t("views.btn.back")), settings_cashier_terminal_path %>
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_cashier_terminals_path %>
     </span>
   </ol>
 </div>
diff --git a/app/views/settings/commissions/show.html.erb b/app/views/settings/commissions/show.html.erb
index f385890c..f92747a5 100755
--- a/app/views/settings/commissions/show.html.erb
+++ b/app/views/settings/commissions/show.html.erb
@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_commissions_path %>">Commission</a></li>
     <li class="breadcrumb-item active">Details</li>
     <span class="float-right">
-      <%= link_to t('.back', :default => t("views.btn.back")), settings_commissioners_path %>
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_commissions_path %>
     </span>
   </ol>
 </div>
diff --git a/app/views/settings/dining_charges/edit.html.erb b/app/views/settings/dining_charges/edit.html.erb
index 7ffedcb1..526d455d 100755
--- a/app/views/settings/dining_charges/edit.html.erb
+++ b/app/views/settings/dining_charges/edit.html.erb
@@ -10,7 +10,14 @@
         <% end %>
     <li class="breadcrumb-item active">New</li>
     <span class="float-right">
-      <%= link_to t('.back', :default => t("views.btn.back")), settings_zone_path(@zone) %>
+    <% if @table %>
+        <%= link_to t('.back', :default => t("views.btn.back")), edit_settings_zone_table_path(@zone,@settings_dining_facility) %>
+          
+        <% elsif @room %>
+        <%= link_to t('.back', :default => t("views.btn.back")), edit_settings_zone_room_path(@zone,@settings_dining_facility) %>
+           
+        <% end %>
+
     </span>
   </ol>
 </div>
diff --git a/app/views/settings/employees/edit.html.erb b/app/views/settings/employees/edit.html.erb
index dae34a31..ef45ddeb 100755
--- a/app/views/settings/employees/edit.html.erb
+++ b/app/views/settings/employees/edit.html.erb
@@ -5,7 +5,7 @@
     <li class="breadcrumb-item"><a href="<%= settings_employees_path %>">Employees</a></li>
     <li class="breadcrumb-item active">Edit</li>
     <span class="float-right">
-      <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
+      <%= link_to t('.back', :default => t("views.btn.back")), settings_employees_path %>
     </span>
   </ol>
 </div>
diff --git a/app/views/settings/employees/show.html.erb b/app/views/settings/employees/show.html.erb
index 35d3dac4..702a347d 100755
--- a/app/views/settings/employees/show.html.erb
+++ b/app/views/settings/employees/show.html.erb
@@ -10,7 +10,7 @@
 <div class="page-header">
   <ol class="breadcrumb">
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
-    <li class="breadcrumb-item">Employees</li>
+    <li class="breadcrumb-item"><a href="<%= settings_employees_path %>">Employees</a></li>
     <li class="breadcrumb-item active">Details</li>
     <span class="float-right">
       <%= link_to t('.back', :default => t("views.btn.back")), settings_employees_path %>
diff --git a/app/views/settings/item_sets/index.html.erb b/app/views/settings/item_sets/index.html.erb
index 15cdbfa2..be5a708f 100755
--- a/app/views/settings/item_sets/index.html.erb
+++ b/app/views/settings/item_sets/index.html.erb
@@ -4,7 +4,7 @@
     <li class="breadcrumb-item"><a href="<%= dashboard_path %>">Home</a></li>
     <li class="breadcrumb-item active">Item Set</li>
     <span class="float-right">
-      <%= link_to t("views.btn.back"), settings_menus_path %>
+      <%= link_to t("views.btn.back"), dashboard_path %>
     </span>
   </ol>
 </div>
diff --git a/app/views/settings/membership_settings/index.html.erb b/app/views/settings/membership_settings/index.html.erb
index 0d9377dc..65715af8 100755
--- a/app/views/settings/membership_settings/index.html.erb
+++ b/app/views/settings/membership_settings/index.html.erb
@@ -11,7 +11,7 @@
 <div class="row">
   <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
     <div class="m-b-10 clearfix">
-      <%= link_to t("views.btn.new"),new_settings_employee_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
+      <%= link_to t("views.btn.new"),new_settings_membership_setting_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
     </div>
     <div class="card">
       <table class="table table-striped">
@@ -20,7 +20,7 @@
             <th>Membership type</th>
             <th>Is active</th>
             <th>Gateway communication type</th>
-            <th>Gateway url</th>
+            <!-- <th>Gateway url</th> -->
         <!-- <th>Auth token</th>
         <th>Merchant account</th> -->
         <th>Discount</th>
@@ -37,7 +37,7 @@
         <td><%= link_to settings_membership_setting.membership_type, edit_settings_membership_setting_path(settings_membership_setting) %></td>
         <td><%= settings_membership_setting.is_active %></td>
         <td><%= settings_membership_setting.gateway_communication_type %></td>
-        <td><%= settings_membership_setting.gateway_url %></td>
+        <!-- <td><%= settings_membership_setting.gateway_url %></td> -->
           <!-- <td><%= settings_membership_setting.auth_token %></td>
           <td><%= settings_membership_setting.merchant_account rescue ''%></td> -->
           <td><%= settings_membership_setting.discount %></td>