diff --git a/app/controllers/settings/cashier_terminals_controller.rb b/app/controllers/settings/cashier_terminals_controller.rb
index 5f28f882..b397d68d 100644
--- a/app/controllers/settings/cashier_terminals_controller.rb
+++ b/app/controllers/settings/cashier_terminals_controller.rb
@@ -4,7 +4,7 @@ class Settings::CashierTerminalsController < ApplicationController
   # GET /settings/cashier_terminals
   # GET /settings/cashier_terminals.json
   def index
-    @settings_cashier_terminals = Settings::CashierTerminal.all
+    @settings_cashier_terminals = CashierTerminal.all
   end
 
   # GET /settings/cashier_terminals/1
@@ -14,7 +14,7 @@ class Settings::CashierTerminalsController < ApplicationController
 
   # GET /settings/cashier_terminals/new
   def new
-    @settings_cashier_terminal = Settings::CashierTerminal.new
+    @settings_cashier_terminal = CashierTerminal.new
   end
 
   # GET /settings/cashier_terminals/1/edit
@@ -24,11 +24,11 @@ class Settings::CashierTerminalsController < ApplicationController
   # POST /settings/cashier_terminals
   # POST /settings/cashier_terminals.json
   def create
-    @settings_cashier_terminal = Settings::CashierTerminal.new(settings_cashier_terminal_params)
+    @settings_cashier_terminal = CashierTerminal.new(settings_cashier_terminal_params)
 
     respond_to do |format|
       if @settings_cashier_terminal.save
-        format.html { redirect_to @settings_cashier_terminal, notice: 'Cashier terminal was successfully created.' }
+        format.html { redirect_to settings_cashier_terminals_path, notice: 'Cashier terminal was successfully created.' }
         format.json { render :show, status: :created, location: @settings_cashier_terminal }
       else
         format.html { render :new }
@@ -42,7 +42,7 @@ class Settings::CashierTerminalsController < ApplicationController
   def update
     respond_to do |format|
       if @settings_cashier_terminal.update(settings_cashier_terminal_params)
-        format.html { redirect_to @settings_cashier_terminal, notice: 'Cashier terminal was successfully updated.' }
+        format.html { redirect_to settings_cashier_terminal_path(@settings_cashier_terminal), notice: 'Cashier terminal was successfully updated.' }
         format.json { render :show, status: :ok, location: @settings_cashier_terminal }
       else
         format.html { render :edit }
@@ -56,7 +56,7 @@ class Settings::CashierTerminalsController < ApplicationController
   def destroy
     @settings_cashier_terminal.destroy
     respond_to do |format|
-      format.html { redirect_to settings_cashier_terminals_url, notice: 'Cashier terminal was successfully destroyed.' }
+      format.html { redirect_to settings_cashier_terminals_path, notice: 'Cashier terminal was successfully destroyed.' }
       format.json { head :no_content }
     end
   end
@@ -64,11 +64,11 @@ class Settings::CashierTerminalsController < ApplicationController
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_settings_cashier_terminal
-      @settings_cashier_terminal = Settings::CashierTerminal.find(params[:id])
+      @settings_cashier_terminal = CashierTerminal.find(params[:id])
     end
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_cashier_terminal_params
-      params.require(:settings_cashier_terminal).permit(:name, :is_active, :is_currently_login, :auto_print_receipt, :printer_name, :header, :footer, :font, :font_size, :show_tax, :show_cashier, :show_guest_info)
+      params.require(:cashier_terminal).permit(:name, :is_active, :is_currently_login, :auto_print_receipt, :printer_name, :header, :footer, :font, :font_size, :show_tax, :show_cashier, :show_guest_info)
     end
 end
diff --git a/app/controllers/settings/lookups_controller.rb b/app/controllers/settings/lookups_controller.rb
index 090357be..2463d640 100644
--- a/app/controllers/settings/lookups_controller.rb
+++ b/app/controllers/settings/lookups_controller.rb
@@ -4,7 +4,7 @@ class Settings::LookupsController < ApplicationController
   # GET /settings/lookups
   # GET /settings/lookups.json
   def index
-    @settings_lookups = Settings::Lookup.all
+    @settings_lookups = Lookup.all
   end
 
   # GET /settings/lookups/1
@@ -14,7 +14,7 @@ class Settings::LookupsController < ApplicationController
 
   # GET /settings/lookups/new
   def new
-    @settings_lookup = Settings::Lookup.new
+    @settings_lookup = Lookup.new
   end
 
   # GET /settings/lookups/1/edit
@@ -24,7 +24,7 @@ class Settings::LookupsController < ApplicationController
   # POST /settings/lookups
   # POST /settings/lookups.json
   def create
-    @settings_lookup = Settings::Lookup.new(settings_lookup_params)
+    @settings_lookup = Lookup.new(settings_lookup_params)
 
     respond_to do |format|
       if @settings_lookup.save
@@ -64,11 +64,11 @@ class Settings::LookupsController < ApplicationController
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_settings_lookup
-      @settings_lookup = Settings::Lookup.find(params[:id])
+      @settings_lookup = Lookup.find(params[:id])
     end
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_lookup_params
-      params.require(:settings_lookup).permit(:lookup_type, :name, :value)
+      params.require(:lookup).permit(:lookup_type, :name, :value)
     end
 end
diff --git a/app/controllers/settings/membership_settings_controller.rb b/app/controllers/settings/membership_settings_controller.rb
index 656ee6fc..cfd672d0 100644
--- a/app/controllers/settings/membership_settings_controller.rb
+++ b/app/controllers/settings/membership_settings_controller.rb
@@ -4,7 +4,7 @@ class Settings::MembershipSettingsController < ApplicationController
   # GET /settings/membership_settings
   # GET /settings/membership_settings.json
   def index
-    @settings_membership_settings = Settings::MembershipSetting.all
+    @settings_membership_settings = MembershipSetting.all
   end
 
   # GET /settings/membership_settings/1
@@ -14,7 +14,7 @@ class Settings::MembershipSettingsController < ApplicationController
 
   # GET /settings/membership_settings/new
   def new
-    @settings_membership_setting = Settings::MembershipSetting.new
+    @settings_membership_setting = MembershipSetting.new
   end
 
   # GET /settings/membership_settings/1/edit
@@ -24,11 +24,11 @@ class Settings::MembershipSettingsController < ApplicationController
   # POST /settings/membership_settings
   # POST /settings/membership_settings.json
   def create
-    @settings_membership_setting = Settings::MembershipSetting.new(settings_membership_setting_params)
+    @settings_membership_setting = MembershipSetting.new(settings_membership_setting_params)
 
     respond_to do |format|
       if @settings_membership_setting.save
-        format.html { redirect_to @settings_membership_setting, notice: 'Membership setting was successfully created.' }
+        format.html { redirect_to settings_membership_settings_path, notice: 'Membership setting was successfully created.' }
         format.json { render :show, status: :created, location: @settings_membership_setting }
       else
         format.html { render :new }
@@ -42,7 +42,7 @@ class Settings::MembershipSettingsController < ApplicationController
   def update
     respond_to do |format|
       if @settings_membership_setting.update(settings_membership_setting_params)
-        format.html { redirect_to @settings_membership_setting, notice: 'Membership setting was successfully updated.' }
+        format.html { redirect_to settings_membership_setting_path(@settings_membership_setting), notice: 'Membership setting was successfully updated.' }
         format.json { render :show, status: :ok, location: @settings_membership_setting }
       else
         format.html { render :edit }
@@ -56,7 +56,7 @@ class Settings::MembershipSettingsController < ApplicationController
   def destroy
     @settings_membership_setting.destroy
     respond_to do |format|
-      format.html { redirect_to settings_membership_settings_url, notice: 'Membership setting was successfully destroyed.' }
+      format.html { redirect_to settings_membership_settings_path, notice: 'Membership setting was successfully destroyed.' }
       format.json { head :no_content }
     end
   end
@@ -64,11 +64,11 @@ class Settings::MembershipSettingsController < ApplicationController
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_settings_membership_setting
-      @settings_membership_setting = Settings::MembershipSetting.find(params[:id])
+      @settings_membership_setting = MembershipSetting.find(params[:id])
     end
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_membership_setting_params
-      params.require(:settings_membership_setting).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by)
+      params.require(:membership_setting).permit(:membership_type, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id, :created_by)
     end
 end
diff --git a/app/controllers/settings/payment_method_settings_controller.rb b/app/controllers/settings/payment_method_settings_controller.rb
index cc61630e..ce27f725 100644
--- a/app/controllers/settings/payment_method_settings_controller.rb
+++ b/app/controllers/settings/payment_method_settings_controller.rb
@@ -4,7 +4,7 @@ class Settings::PaymentMethodSettingsController < ApplicationController
   # GET /settings/payment_method_settings
   # GET /settings/payment_method_settings.json
   def index
-    @settings_payment_method_settings = Settings::PaymentMethodSetting.all
+    @settings_payment_method_settings = PaymentMethodSetting.all
   end
 
   # GET /settings/payment_method_settings/1
@@ -14,7 +14,7 @@ class Settings::PaymentMethodSettingsController < ApplicationController
 
   # GET /settings/payment_method_settings/new
   def new
-    @settings_payment_method_setting = Settings::PaymentMethodSetting.new
+    @settings_payment_method_setting = PaymentMethodSetting.new
   end
 
   # GET /settings/payment_method_settings/1/edit
@@ -24,11 +24,11 @@ class Settings::PaymentMethodSettingsController < ApplicationController
   # POST /settings/payment_method_settings
   # POST /settings/payment_method_settings.json
   def create
-    @settings_payment_method_setting = Settings::PaymentMethodSetting.new(settings_payment_method_setting_params)
+    @settings_payment_method_setting = PaymentMethodSetting.new(settings_payment_method_setting_params)
 
     respond_to do |format|
       if @settings_payment_method_setting.save
-        format.html { redirect_to @settings_payment_method_setting, notice: 'Payment method setting was successfully created.' }
+        format.html { redirect_to settings_payment_method_settings_path, notice: 'Payment method setting was successfully created.' }
         format.json { render :show, status: :created, location: @settings_payment_method_setting }
       else
         format.html { render :new }
@@ -42,7 +42,7 @@ class Settings::PaymentMethodSettingsController < ApplicationController
   def update
     respond_to do |format|
       if @settings_payment_method_setting.update(settings_payment_method_setting_params)
-        format.html { redirect_to @settings_payment_method_setting, notice: 'Payment method setting was successfully updated.' }
+        format.html { redirect_to settings_payment_method_setting_path(@settings_payment_method_setting), notice: 'Payment method setting was successfully updated.' }
         format.json { render :show, status: :ok, location: @settings_payment_method_setting }
       else
         format.html { render :edit }
@@ -56,7 +56,7 @@ class Settings::PaymentMethodSettingsController < ApplicationController
   def destroy
     @settings_payment_method_setting.destroy
     respond_to do |format|
-      format.html { redirect_to settings_payment_method_settings_url, notice: 'Payment method setting was successfully destroyed.' }
+      format.html { redirect_to settings_payment_method_settings_path, notice: 'Payment method setting was successfully destroyed.' }
       format.json { head :no_content }
     end
   end
@@ -64,11 +64,11 @@ class Settings::PaymentMethodSettingsController < ApplicationController
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_settings_payment_method_setting
-      @settings_payment_method_setting = Settings::PaymentMethodSetting.find(params[:id])
+      @settings_payment_method_setting = PaymentMethodSetting.find(params[:id])
     end
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_payment_method_setting_params
-      params.require(:settings_payment_method_setting).permit(:payment_method, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id)
+      params.require(:payment_method_setting).permit(:payment_method, :is_active, :gateway_communication_type, :gateway_url, :auth_token, :merchant_account_id)
     end
 end
diff --git a/app/views/settings/cashier_terminals/_form.html.erb b/app/views/settings/cashier_terminals/_form.html.erb
index 9678fb12..ee8a4d27 100644
--- a/app/views/settings/cashier_terminals/_form.html.erb
+++ b/app/views/settings/cashier_terminals/_form.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for(@settings_cashier_terminal) do |f| %>
+<%= simple_form_for([:settings, @settings_cashier_terminal]) do |f| %>
   <%= f.error_notification %>
 
   <div class="form-inputs">
@@ -7,8 +7,6 @@
     <%= f.input :is_currently_login %>
     <%= f.input :auto_print_receipt %>
     <%= f.input :printer_name %>
-    <%= f.input :header %>
-    <%= f.input :footer %>
     <%= f.input :font %>
     <%= f.input :font_size %>
     <%= f.input :show_tax %>
diff --git a/app/views/settings/cashier_terminals/edit.html.erb b/app/views/settings/cashier_terminals/edit.html.erb
index 7bd6dfcc..9329c205 100644
--- a/app/views/settings/cashier_terminals/edit.html.erb
+++ b/app/views/settings/cashier_terminals/edit.html.erb
@@ -1,6 +1,11 @@
-<h1>Editing Settings Cashier Terminal</h1>
 
-<%= render 'form', settings_cashier_terminal: @settings_cashier_terminal %>
-
-<%= link_to 'Show', @settings_cashier_terminal %> |
-<%= link_to 'Back', settings_cashier_terminals_path %>
+<div class="span12">
+		<div class="page-header">
+		 <ul class="breadcrumb">
+		   	<li><a href="<%= root_path %>">Home</a></li>
+  			<li><a href="<%= settings_cashier_terminals_path %>">Cashier Terminal</a></li>
+		  	<li>Edit</li>
+		 </ul>
+		</div>
+    <%= render 'form', settings_cashier_terminal: @settings_cashier_terminal %>
+</div>
diff --git a/app/views/settings/cashier_terminals/index.html.erb b/app/views/settings/cashier_terminals/index.html.erb
index f939fe05..24397ea9 100644
--- a/app/views/settings/cashier_terminals/index.html.erb
+++ b/app/views/settings/cashier_terminals/index.html.erb
@@ -1,49 +1,52 @@
-<p id="notice"><%= notice %></p>
 
-<h1>Settings Cashier Terminals</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th>Name</th>
-      <th>Is active</th>
-      <th>Is currently login</th>
-      <th>Auto print receipt</th>
-      <th>Printer name</th>
-      <th>Header</th>
-      <th>Footer</th>
-      <th>Font</th>
-      <th>Font size</th>
-      <th>Show tax</th>
-      <th>Show cashier</th>
-      <th>Show guest info</th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @settings_cashier_terminals.each do |settings_cashier_terminal| %>
+<div class="page-header">
+ <ul class="breadcrumb">
+  <li><a href="<%=  %>">Home</a></li>
+  <li>Cashier Terminal</li>
+  <span style="float: right">
+    <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_cashier_terminal_path,:class => 'btn btn-primary btn-sm' %>
+  </span>
+ </ul>
+</div>
+<div class="card">
+  <table class="table table-striped">
+    <thead>
       <tr>
-        <td><%= settings_cashier_terminal.name %></td>
-        <td><%= settings_cashier_terminal.is_active %></td>
-        <td><%= settings_cashier_terminal.is_currently_login %></td>
-        <td><%= settings_cashier_terminal.auto_print_receipt %></td>
-        <td><%= settings_cashier_terminal.printer_name %></td>
-        <td><%= settings_cashier_terminal.header %></td>
-        <td><%= settings_cashier_terminal.footer %></td>
-        <td><%= settings_cashier_terminal.font %></td>
-        <td><%= settings_cashier_terminal.font_size %></td>
-        <td><%= settings_cashier_terminal.show_tax %></td>
-        <td><%= settings_cashier_terminal.show_cashier %></td>
-        <td><%= settings_cashier_terminal.show_guest_info %></td>
-        <td><%= link_to 'Show', settings_cashier_terminal %></td>
-        <td><%= link_to 'Edit', edit_settings_cashier_terminal_path(settings_cashier_terminal) %></td>
-        <td><%= link_to 'Destroy', settings_cashier_terminal, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <th>Name</th>
+        <th>Is active</th>
+        <th>Is currently login</th>
+        <th>Auto print receipt</th>
+        <th>Printer name</th>
+        <th>Header</th>
+        <th>Footer</th>
+        <th>Font</th>
+        <th>Font size</th>
+        <th>Show tax</th>
+        <th>Show cashier</th>
+        <th>Show guest info</th>
+        <th style="width:20%">Action</th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
 
-<br>
-
-<%= link_to 'New Settings Cashier Terminal', new_settings_cashier_terminal_path %>
+    <tbody>
+      <% @settings_cashier_terminals.each do |settings_cashier_terminal| %>
+        <tr>
+          <td><%= settings_cashier_terminal.name %></td>
+          <td><%= settings_cashier_terminal.is_active %></td>
+          <td><%= settings_cashier_terminal.is_currently_login %></td>
+          <td><%= settings_cashier_terminal.auto_print_receipt %></td>
+          <td><%= settings_cashier_terminal.printer_name %></td>
+          <td><%= settings_cashier_terminal.header %></td>
+          <td><%= settings_cashier_terminal.footer %></td>
+          <td><%= settings_cashier_terminal.font %></td>
+          <td><%= settings_cashier_terminal.font_size %></td>
+          <td><%= settings_cashier_terminal.show_tax %></td>
+          <td><%= settings_cashier_terminal.show_cashier %></td>
+          <td><%= settings_cashier_terminal.show_guest_info %></td>
+          <td><%= link_to 'Edit', edit_settings_cashier_terminal_path(settings_cashier_terminal) %>
+          | <%= link_to 'Destroy', settings_cashier_terminal_path(settings_cashier_terminal), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
diff --git a/app/views/settings/cashier_terminals/new.html.erb b/app/views/settings/cashier_terminals/new.html.erb
index abccf4ff..9ba176f4 100644
--- a/app/views/settings/cashier_terminals/new.html.erb
+++ b/app/views/settings/cashier_terminals/new.html.erb
@@ -1,5 +1,11 @@
-<h1>New Settings Cashier Terminal</h1>
 
-<%= render 'form', settings_cashier_terminal: @settings_cashier_terminal %>
-
-<%= link_to 'Back', settings_cashier_terminals_path %>
+<div class="span12">
+		<div class="page-header">
+		 <ul class="breadcrumb">
+		   	<li><a href="<%= root_path %>">Home</a></li>
+  			<li><a href="<%= settings_cashier_terminals_path %>">Cashier Terminal</a></li>
+		  	<li>New</li>
+		 </ul>
+		</div>
+    <%= render 'form', settings_cashier_terminal: @settings_cashier_terminal %>
+</div>
diff --git a/app/views/settings/cashier_terminals/show.html.erb b/app/views/settings/cashier_terminals/show.html.erb
index 068670e6..bb47df59 100644
--- a/app/views/settings/cashier_terminals/show.html.erb
+++ b/app/views/settings/cashier_terminals/show.html.erb
@@ -1,64 +1,78 @@
-<p id="notice"><%= notice %></p>
 
-<p>
-  <strong>Name:</strong>
-  <%= @settings_cashier_terminal.name %>
-</p>
+<div class="page-header">
+ <ul class="breadcrumb">
+  <li><a href="<%=  %>">Home</a></li>
+  <li>Settings</li>
+  <li>Cashier Terminal</li>
+  <span style="float: right">
+  </span>
+ </ul>
+</div>
+<div class="card">
+  <div class="card-block">
+    <h4 class="card-title">Cashier Terminal</h4>
+    <table class="table">
+      <tr>
+        <td><strong>Name:</strong></td>
+        <td><%= @settings_cashier_terminal.name %><td>
+      </tr>
 
-<p>
-  <strong>Is active:</strong>
-  <%= @settings_cashier_terminal.is_active %>
-</p>
+      <tr>
+        <td><strong>Is active:</strong></td>
+        <td><%= @settings_cashier_terminal.is_active %></td>
+      </tr>
 
-<p>
-  <strong>Is currently login:</strong>
-  <%= @settings_cashier_terminal.is_currently_login %>
-</p>
+     <tr>
+        <td><strong>Is currently login:</strong></td>
+        <td><%= @settings_cashier_terminal.is_currently_login %></td>
+      </p>
 
-<p>
-  <strong>Auto print receipt:</strong>
-  <%= @settings_cashier_terminal.auto_print_receipt %>
-</p>
+      <tr>
+        <strong>Auto print receipt:</strong>
+        <%= @settings_cashier_terminal.auto_print_receipt %>
+      </p>
 
-<p>
-  <strong>Printer name:</strong>
-  <%= @settings_cashier_terminal.printer_name %>
-</p>
+      <tr>
+        <strong>Printer name:</strong>
+        <%= @settings_cashier_terminal.printer_name %>
+      </p>
 
-<p>
-  <strong>Header:</strong>
-  <%= @settings_cashier_terminal.header %>
-</p>
+      <tr>
+        <strong>Header:</strong>
+        <%= @settings_cashier_terminal.header %>
+      </p>
 
-<p>
-  <strong>Footer:</strong>
-  <%= @settings_cashier_terminal.footer %>
-</p>
+      <tr>
+        <strong>Footer:</strong>
+        <%= @settings_cashier_terminal.footer %>
+      </p>
 
-<p>
-  <strong>Font:</strong>
-  <%= @settings_cashier_terminal.font %>
-</p>
+      <tr>
+        <strong>Font:</strong>
+        <%= @settings_cashier_terminal.font %>
+      </p>
 
-<p>
-  <strong>Font size:</strong>
-  <%= @settings_cashier_terminal.font_size %>
-</p>
+      <tr>
+        <strong>Font size:</strong>
+        <%= @settings_cashier_terminal.font_size %>
+      </p>
 
-<p>
-  <strong>Show tax:</strong>
-  <%= @settings_cashier_terminal.show_tax %>
-</p>
+      <tr>
+        <strong>Show tax:</strong>
+        <%= @settings_cashier_terminal.show_tax %>
+      </p>
 
-<p>
-  <strong>Show cashier:</strong>
-  <%= @settings_cashier_terminal.show_cashier %>
-</p>
+      <tr>
+        <strong>Show cashier:</strong>
+        <%= @settings_cashier_terminal.show_cashier %>
+      </p>
 
-<p>
-  <strong>Show guest info:</strong>
-  <%= @settings_cashier_terminal.show_guest_info %>
-</p>
+      <tr>
+        <strong>Show guest info:</strong>
+        <%= @settings_cashier_terminal.show_guest_info %>
+      </p>
+    </table>
+  </div>
+</div>
 
-<%= link_to 'Edit', edit_settings_cashier_terminal_path(@settings_cashier_terminal) %> |
-<%= link_to 'Back', settings_cashier_terminals_path %>
+</div>
diff --git a/app/views/settings/membership_settings/_form.html.erb b/app/views/settings/membership_settings/_form.html.erb
index 3a6ac343..85b52488 100644
--- a/app/views/settings/membership_settings/_form.html.erb
+++ b/app/views/settings/membership_settings/_form.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for(@settings_membership_setting) do |f| %>
+<%= simple_form_for([:settings, @settings_membership_setting]) do |f| %>
   <%= f.error_notification %>
 
   <div class="form-inputs">
@@ -7,7 +7,6 @@
     <%= f.input :gateway_communication_type %>
     <%= f.input :gateway_url %>
     <%= f.input :auth_token %>
-    <%= f.association :merchant_account %>
     <%= f.input :created_by %>
   </div>
 
diff --git a/app/views/settings/membership_settings/edit.html.erb b/app/views/settings/membership_settings/edit.html.erb
index 2402dbe0..9e88aef8 100644
--- a/app/views/settings/membership_settings/edit.html.erb
+++ b/app/views/settings/membership_settings/edit.html.erb
@@ -1,6 +1,11 @@
-<h1>Editing Settings Membership Setting</h1>
 
-<%= render 'form', settings_membership_setting: @settings_membership_setting %>
-
-<%= link_to 'Show', @settings_membership_setting %> |
-<%= link_to 'Back', settings_membership_settings_path %>
+<div class="span12">
+		<div class="page-header">
+		 <ul class="breadcrumb">
+		   	<li><a href="<%= root_path %>">Home</a></li>
+  			<li><a href="<%= settings_membership_settings_path %>">Membership Setting</a></li>
+		  	<li>Edit</li>
+		 </ul>
+		</div>
+    <%= render 'form', settings_membership_setting: @settings_membership_setting %>
+</div>
diff --git a/app/views/settings/membership_settings/index.html.erb b/app/views/settings/membership_settings/index.html.erb
index 2054bc12..9099e9e4 100644
--- a/app/views/settings/membership_settings/index.html.erb
+++ b/app/views/settings/membership_settings/index.html.erb
@@ -1,39 +1,42 @@
-<p id="notice"><%= notice %></p>
 
-<h1>Settings Membership Settings</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th>Membership type</th>
-      <th>Is active</th>
-      <th>Gateway communication type</th>
-      <th>Gateway url</th>
-      <th>Auth token</th>
-      <th>Merchant account</th>
-      <th>Created by</th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @settings_membership_settings.each do |settings_membership_setting| %>
+<div class="page-header">
+ <ul class="breadcrumb">
+  <li><a href="<%=  %>">Home</a></li>
+  <li>Membership Setting</li>
+  <span style="float: right">
+    <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_membership_setting_path,:class => 'btn btn-primary btn-sm' %>
+  </span>
+ </ul>
+</div>
+<div class="card">
+  <table class="table table-striped">
+    <thead>
       <tr>
-        <td><%= settings_membership_setting.membership_type %></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.auth_token %></td>
-        <td><%= settings_membership_setting.merchant_account %></td>
-        <td><%= settings_membership_setting.created_by %></td>
-        <td><%= link_to 'Show', settings_membership_setting %></td>
-        <td><%= link_to 'Edit', edit_settings_membership_setting_path(settings_membership_setting) %></td>
-        <td><%= link_to 'Destroy', settings_membership_setting, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <th>Membership type</th>
+        <th>Is active</th>
+        <th>Gateway communication type</th>
+        <th>Gateway url</th>
+        <th>Auth token</th>
+        <th>Merchant account</th>
+        <th>Created by</th>
+        <th colspan="3"></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
 
-<br>
-
-<%= link_to 'New Settings Membership Setting', new_settings_membership_setting_path %>
+    <tbody>
+      <% @settings_membership_settings.each do |settings_membership_setting| %>
+        <tr>
+          <td><%= link_to settings_membership_setting.membership_type, 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.auth_token %></td>
+          <td><%= settings_membership_setting.merchant_account rescue ''%></td>
+          <td><%= settings_membership_setting.created_by %></td>
+          <td><%= link_to 'Edit', edit_settings_membership_setting_path(settings_membership_setting) %></td>
+          <td><%= link_to 'Destroy', settings_membership_setting_path(settings_membership_setting), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
diff --git a/app/views/settings/membership_settings/new.html.erb b/app/views/settings/membership_settings/new.html.erb
index 5f58b19b..1789a621 100644
--- a/app/views/settings/membership_settings/new.html.erb
+++ b/app/views/settings/membership_settings/new.html.erb
@@ -1,5 +1,11 @@
-<h1>New Settings Membership Setting</h1>
 
-<%= render 'form', settings_membership_setting: @settings_membership_setting %>
-
-<%= link_to 'Back', settings_membership_settings_path %>
+<div class="span12">
+		<div class="page-header">
+		 <ul class="breadcrumb">
+		   	<li><a href="<%= root_path %>">Home</a></li>
+  			<li><a href="<%= settings_membership_settings_path %>">Membership Setting</a></li>
+		  	<li>New</li>
+		 </ul>
+		</div>
+    <%= render 'form', settings_membership_setting: @settings_membership_setting %>
+</div>
diff --git a/app/views/settings/membership_settings/show.html.erb b/app/views/settings/membership_settings/show.html.erb
index 7bd5ec17..de4d610d 100644
--- a/app/views/settings/membership_settings/show.html.erb
+++ b/app/views/settings/membership_settings/show.html.erb
@@ -27,7 +27,7 @@
 
 <p>
   <strong>Merchant account:</strong>
-  <%= @settings_membership_setting.merchant_account %>
+  <%= @settings_membership_setting.merchant_account rescue ''%>
 </p>
 
 <p>
diff --git a/app/views/settings/payment_method_settings/_form.html.erb b/app/views/settings/payment_method_settings/_form.html.erb
index 15904ba9..740ad046 100644
--- a/app/views/settings/payment_method_settings/_form.html.erb
+++ b/app/views/settings/payment_method_settings/_form.html.erb
@@ -1,4 +1,4 @@
-<%= simple_form_for(@settings_payment_method_setting) do |f| %>
+<%= simple_form_for([:settings, @settings_payment_method_setting]) do |f| %>
   <%= f.error_notification %>
 
   <div class="form-inputs">
@@ -7,7 +7,7 @@
     <%= f.input :gateway_communication_type %>
     <%= f.input :gateway_url %>
     <%= f.input :auth_token %>
-    <%= f.association :merchant_account %>
+    <%= f.input :merchant_account_id %>
   </div>
 
   <div class="form-actions">
diff --git a/app/views/settings/payment_method_settings/edit.html.erb b/app/views/settings/payment_method_settings/edit.html.erb
index 1cac4d57..50fa8097 100644
--- a/app/views/settings/payment_method_settings/edit.html.erb
+++ b/app/views/settings/payment_method_settings/edit.html.erb
@@ -1,6 +1,11 @@
-<h1>Editing Settings Payment Method Setting</h1>
 
-<%= render 'form', settings_payment_method_setting: @settings_payment_method_setting %>
-
-<%= link_to 'Show', @settings_payment_method_setting %> |
-<%= link_to 'Back', settings_payment_method_settings_path %>
+<div class="span12">
+		<div class="page-header">
+		 <ul class="breadcrumb">
+		   	<li><a href="<%= root_path %>">Home</a></li>
+  			<li><a href="<%= settings_payment_method_settings_path %>">Payment Method Setting</a></li>
+		  	<li>Edit</li>
+		 </ul>
+		</div>
+  <%= render 'form', settings_payment_method_setting: @settings_payment_method_setting %>
+</div>
diff --git a/app/views/settings/payment_method_settings/index.html.erb b/app/views/settings/payment_method_settings/index.html.erb
index 13d9b88a..85b21aef 100644
--- a/app/views/settings/payment_method_settings/index.html.erb
+++ b/app/views/settings/payment_method_settings/index.html.erb
@@ -1,37 +1,42 @@
-<p id="notice"><%= notice %></p>
 
-<h1>Settings Payment Method Settings</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th>Payment method</th>
-      <th>Is active</th>
-      <th>Gateway communication type</th>
-      <th>Gateway url</th>
-      <th>Auth token</th>
-      <th>Merchant account</th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @settings_payment_method_settings.each do |settings_payment_method_setting| %>
-      <tr>
-        <td><%= settings_payment_method_setting.payment_method %></td>
-        <td><%= settings_payment_method_setting.is_active %></td>
-        <td><%= settings_payment_method_setting.gateway_communication_type %></td>
-        <td><%= settings_payment_method_setting.gateway_url %></td>
-        <td><%= settings_payment_method_setting.auth_token %></td>
-        <td><%= settings_payment_method_setting.merchant_account %></td>
-        <td><%= link_to 'Show', settings_payment_method_setting %></td>
-        <td><%= link_to 'Edit', edit_settings_payment_method_setting_path(settings_payment_method_setting) %></td>
-        <td><%= link_to 'Destroy', settings_payment_method_setting, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+<div class="page-header">
+ <ul class="breadcrumb">
+  <li><a href="<%=  %>">Home</a></li>
+  <li>Payment Method</li>
+  <span style="float: right">
+    <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_payment_method_setting_path,:class => 'btn btn-primary btn-sm' %>
+  </span>
+ </ul>
+</div>
 
 <br>
+<div class="card">
+  <table class="table table-striped">
+    <thead>
+      <tr>
+        <th>Payment method</th>
+        <th>Is active</th>
+        <th>Gateway communication type</th>
+        <th>Gateway url</th>
+        <th>Auth token</th>
+        <th>Merchant account</th>
+        <th colspan="3"></th>
+      </tr>
+    </thead>
 
-<%= link_to 'New Settings Payment Method Setting', new_settings_payment_method_setting_path %>
+    <tbody>
+      <% @settings_payment_method_settings.each do |settings_payment_method_setting| %>
+        <tr>
+          <td><%= settings_payment_method_setting.payment_method %></td>
+          <td><%= settings_payment_method_setting.is_active %></td>
+          <td><%= settings_payment_method_setting.gateway_communication_type %></td>
+          <td><%= settings_payment_method_setting.gateway_url %></td>
+          <td><%= settings_payment_method_setting.auth_token %></td>
+          <td><%= settings_payment_method_setting.merchant_account_id %></td>
+          <td><%= link_to 'Edit', edit_settings_payment_method_setting_path(settings_payment_method_setting) %>
+          | <%= link_to 'Destroy', settings_payment_method_settings_path(settings_payment_method_setting), method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
diff --git a/app/views/settings/payment_method_settings/new.html.erb b/app/views/settings/payment_method_settings/new.html.erb
index c63100b3..421ef949 100644
--- a/app/views/settings/payment_method_settings/new.html.erb
+++ b/app/views/settings/payment_method_settings/new.html.erb
@@ -1,5 +1,11 @@
-<h1>New Settings Payment Method Setting</h1>
 
-<%= render 'form', settings_payment_method_setting: @settings_payment_method_setting %>
-
-<%= link_to 'Back', settings_payment_method_settings_path %>
+<div class="span12">
+		<div class="page-header">
+		 <ul class="breadcrumb">
+		   	<li><a href="<%= root_path %>">Home</a></li>
+  			<li><a href="<%= settings_payment_method_settings_path %>"> Payment Method Setting</a></li>
+		  	<li>New</li>
+		 </ul>
+		</div>
+    <%= render 'form', settings_payment_method_setting: @settings_payment_method_setting %>
+</div>
diff --git a/app/views/settings/payment_method_settings/show.html.erb b/app/views/settings/payment_method_settings/show.html.erb
index d6517b05..b8b7f422 100644
--- a/app/views/settings/payment_method_settings/show.html.erb
+++ b/app/views/settings/payment_method_settings/show.html.erb
@@ -27,7 +27,7 @@
 
 <p>
   <strong>Merchant account:</strong>
-  <%= @settings_payment_method_setting.merchant_account %>
+  <%= @settings_payment_method_setting.merchant_account_id %>
 </p>
 
 <%= link_to 'Edit', edit_settings_payment_method_setting_path(@settings_payment_method_setting) %> |