diff --git a/app/assets/javascripts/BSBMaterial/admin.js b/app/assets/javascripts/BSBMaterial/admin.js
index 50a3a8a2..f670db1f 100755
--- a/app/assets/javascripts/BSBMaterial/admin.js
+++ b/app/assets/javascripts/BSBMaterial/admin.js
@@ -444,7 +444,7 @@ $.AdminBSB.browser = {
}
//==========================================================================================================================
-$(document).on('turbolinks:load', function() {
+$(document).ready(function() {
$.AdminBSB.browser.activate();
$.AdminBSB.leftSideBar.activate();
$.AdminBSB.rightSideBar.activate();
diff --git a/app/assets/javascripts/BSBMaterial/demo.js b/app/assets/javascripts/BSBMaterial/demo.js
index bb09d5ac..6121099e 100755
--- a/app/assets/javascripts/BSBMaterial/demo.js
+++ b/app/assets/javascripts/BSBMaterial/demo.js
@@ -1,4 +1,4 @@
-$(document).on('turbolinks:load', function() {
+$(document).ready(function() {
skinChanger();
activateNotificationAndTasksScroll();
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 2fe04719..42ae2ce3 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -11,12 +11,12 @@
// about supported directives.
//
//= require jquery
-//= require jquery.turbolinks
-//= require tether
+//= require jquery_nested_form
//= require jquery_ujs
+//= require cable
+//= require tether
//= require bootstrap/js/popper.min
//= require bootstrap/js/bootstrap-material-design.min
-//= require jquery_nested_form
//= require momentjs/moment
//= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
//= require multi-select/js/jquery.multi-select.js
@@ -29,14 +29,12 @@
//= require raphael/raphael.min
//= require chartjs/Chart.bundle.js
//= require fileinput.min
-//= require cable
-//= require turbolinks
//= require settings/processing_items
//= require BSBMaterial/admin.js
//= require BSBMaterial/demo.js
//= require custom.js
-$(document).on('turbolinks:load', function() {
+$(document).ready(function() {
$('.count-to').countTo();
//Sales count to
diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index 7d37793c..e33ed566 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -1,4 +1,4 @@
-$(document).on('turbolinks:load', function() {
+$(document).ready(function() {
$('body').bootstrapMaterialDesign();
var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
diff --git a/app/assets/javascripts/settings/processing_items.js b/app/assets/javascripts/settings/processing_items.js
index 60c53ba4..73d8f66a 100755
--- a/app/assets/javascripts/settings/processing_items.js
+++ b/app/assets/javascripts/settings/processing_items.js
@@ -1,4 +1,4 @@
-$(document).on('turbolinks:load', function() {
+$(document).ready(function() {
$(".processitems").click(function(event){
event.preventDefault();
console.log($(this).data("id"));
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index eb89e4f4..24197c5a 100755
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -4,14 +4,14 @@
-
+
SmartSales : Restaurant
<%= csrf_meta_tags %>
- <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
- <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+ <%= stylesheet_link_tag 'application', media: 'all' %>
+ <%= javascript_include_tag 'application' %>
diff --git a/app/views/settings/cashier_terminals/_form.html.erb b/app/views/settings/cashier_terminals/_form.html.erb
index 5de2f98c..454851ba 100755
--- a/app/views/settings/cashier_terminals/_form.html.erb
+++ b/app/views/settings/cashier_terminals/_form.html.erb
@@ -54,8 +54,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/views/settings/commissioners/_form.html.erb b/app/views/settings/commissioners/_form.html.erb
index c123e434..efdcab31 100755
--- a/app/views/settings/commissioners/_form.html.erb
+++ b/app/views/settings/commissioners/_form.html.erb
@@ -52,8 +52,4 @@
-
+
diff --git a/app/views/settings/commissions/_form.html.erb b/app/views/settings/commissions/_form.html.erb
index a1a2368a..85a3a27d 100755
--- a/app/views/settings/commissions/_form.html.erb
+++ b/app/views/settings/commissions/_form.html.erb
@@ -44,8 +44,4 @@
-
+
diff --git a/app/views/settings/item_sets/_form.html.erb b/app/views/settings/item_sets/_form.html.erb
index c26e9b1d..ab600e6d 100755
--- a/app/views/settings/item_sets/_form.html.erb
+++ b/app/views/settings/item_sets/_form.html.erb
@@ -40,8 +40,4 @@
-
+
diff --git a/app/views/settings/lookups/_form.html.erb b/app/views/settings/lookups/_form.html.erb
index 4beb4ba4..8196a906 100755
--- a/app/views/settings/lookups/_form.html.erb
+++ b/app/views/settings/lookups/_form.html.erb
@@ -28,8 +28,4 @@
-
+
diff --git a/app/views/settings/membership_actions/_form.html.erb b/app/views/settings/membership_actions/_form.html.erb
index 6938dcb4..b2524a1c 100755
--- a/app/views/settings/membership_actions/_form.html.erb
+++ b/app/views/settings/membership_actions/_form.html.erb
@@ -30,8 +30,4 @@
-
+
diff --git a/app/views/settings/membership_settings/_form.html.erb b/app/views/settings/membership_settings/_form.html.erb
index d81025ea..19361bb4 100755
--- a/app/views/settings/membership_settings/_form.html.erb
+++ b/app/views/settings/membership_settings/_form.html.erb
@@ -32,8 +32,4 @@
-
+
diff --git a/app/views/settings/menu_categories/_form.html.erb b/app/views/settings/menu_categories/_form.html.erb
index b40e2579..a0a0137f 100755
--- a/app/views/settings/menu_categories/_form.html.erb
+++ b/app/views/settings/menu_categories/_form.html.erb
@@ -44,8 +44,4 @@
-
+
diff --git a/app/views/settings/menu_item_attributes/_form.html.erb b/app/views/settings/menu_item_attributes/_form.html.erb
index a6eecce6..71ba75bf 100755
--- a/app/views/settings/menu_item_attributes/_form.html.erb
+++ b/app/views/settings/menu_item_attributes/_form.html.erb
@@ -36,8 +36,4 @@
-
+
diff --git a/app/views/settings/menu_item_options/_form.html.erb b/app/views/settings/menu_item_options/_form.html.erb
index f6ff0721..266be9e5 100755
--- a/app/views/settings/menu_item_options/_form.html.erb
+++ b/app/views/settings/menu_item_options/_form.html.erb
@@ -37,8 +37,4 @@
-
+
diff --git a/app/views/settings/menu_item_sets/_form.html.erb b/app/views/settings/menu_item_sets/_form.html.erb
index 35178914..31688a80 100755
--- a/app/views/settings/menu_item_sets/_form.html.erb
+++ b/app/views/settings/menu_item_sets/_form.html.erb
@@ -26,8 +26,4 @@
-
+
diff --git a/app/views/settings/menus/_form.html.erb b/app/views/settings/menus/_form.html.erb
index 458b4baf..5b103395 100755
--- a/app/views/settings/menus/_form.html.erb
+++ b/app/views/settings/menus/_form.html.erb
@@ -66,8 +66,4 @@
-
+
diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb
index 3aca6ff0..97792930 100755
--- a/app/views/settings/order_queue_stations/_form.html.erb
+++ b/app/views/settings/order_queue_stations/_form.html.erb
@@ -59,8 +59,4 @@ div.form-inputs span{
-
+
diff --git a/app/views/settings/payment_method_settings/_form.html.erb b/app/views/settings/payment_method_settings/_form.html.erb
index db1a2aca..43804214 100755
--- a/app/views/settings/payment_method_settings/_form.html.erb
+++ b/app/views/settings/payment_method_settings/_form.html.erb
@@ -46,8 +46,4 @@
-
+
diff --git a/app/views/settings/processing_items/_form.html.erb b/app/views/settings/processing_items/_form.html.erb
index 3faa3dc4..48b45dfc 100755
--- a/app/views/settings/processing_items/_form.html.erb
+++ b/app/views/settings/processing_items/_form.html.erb
@@ -85,8 +85,4 @@
-
+
diff --git a/app/views/settings/products/_form.html.erb b/app/views/settings/products/_form.html.erb
index c972bca5..a1a448ba 100755
--- a/app/views/settings/products/_form.html.erb
+++ b/app/views/settings/products/_form.html.erb
@@ -62,8 +62,4 @@
-
+
diff --git a/app/views/settings/promotion_products/_form.html.erb b/app/views/settings/promotion_products/_form.html.erb
index 299c9631..267d23a5 100755
--- a/app/views/settings/promotion_products/_form.html.erb
+++ b/app/views/settings/promotion_products/_form.html.erb
@@ -45,8 +45,4 @@
-
+
diff --git a/app/views/settings/rooms/_form.html.erb b/app/views/settings/rooms/_form.html.erb
index 7567e786..a9f0ff57 100755
--- a/app/views/settings/rooms/_form.html.erb
+++ b/app/views/settings/rooms/_form.html.erb
@@ -77,8 +77,4 @@
-
+
diff --git a/app/views/settings/set_menu_items/_form.html.erb b/app/views/settings/set_menu_items/_form.html.erb
index 24c4cf06..6f08b811 100755
--- a/app/views/settings/set_menu_items/_form.html.erb
+++ b/app/views/settings/set_menu_items/_form.html.erb
@@ -91,8 +91,4 @@
-
+
diff --git a/app/views/settings/simple_menu_items/_form.html.erb b/app/views/settings/simple_menu_items/_form.html.erb
index 925372ee..e5ca90c1 100755
--- a/app/views/settings/simple_menu_items/_form.html.erb
+++ b/app/views/settings/simple_menu_items/_form.html.erb
@@ -81,8 +81,4 @@
-
+
diff --git a/app/views/settings/tables/_form.html.erb b/app/views/settings/tables/_form.html.erb
index 233a28b7..d3701079 100755
--- a/app/views/settings/tables/_form.html.erb
+++ b/app/views/settings/tables/_form.html.erb
@@ -72,8 +72,4 @@
-
+
diff --git a/app/views/settings/tax_profiles/_form.html.erb b/app/views/settings/tax_profiles/_form.html.erb
index 718d6811..5f2f3347 100755
--- a/app/views/settings/tax_profiles/_form.html.erb
+++ b/app/views/settings/tax_profiles/_form.html.erb
@@ -41,9 +41,5 @@
-
+
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index f0799d68..973000b4 100755
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -48,3 +48,4 @@ Rails.application.config.assets.precompile += %w( sx-sidebar.css )
Rails.application.config.assets.precompile += %w( inventory_definitions.css )
Rails.application.config.assets.precompile += %w( inventory.js )
+