diff --git a/app/assets/javascripts/BSBMaterial/admin.js b/app/assets/javascripts/BSBMaterial/admin.js
index f670db1f..8366ea20 100755
--- a/app/assets/javascripts/BSBMaterial/admin.js
+++ b/app/assets/javascripts/BSBMaterial/admin.js
@@ -44,7 +44,7 @@ $.AdminBSB.options = {
 
 /* Left Sidebar - Function =================================================================================================
 *  You can manage the left sidebar menu options
-*  
+*
 */
 $.AdminBSB.leftSideBar = {
     activate: function () {
@@ -157,7 +157,7 @@ $.AdminBSB.leftSideBar = {
 
 /* Right Sidebar - Function ================================================================================================
 *  You can manage the right sidebar menu options
-*  
+*
 */
 $.AdminBSB.rightSideBar = {
     activate: function () {
@@ -189,7 +189,7 @@ $.AdminBSB.rightSideBar = {
 
 /* Searchbar - Function ================================================================================================
 *  You can manage the search bar
-*  
+*
 */
 var $searchBar = $('.search-bar');
 $.AdminBSB.search = {
@@ -226,7 +226,7 @@ $.AdminBSB.search = {
 
 /* Navbar - Function =======================================================================================================
 *  You can manage the navbar
-*  
+*
 */
 $.AdminBSB.navbar = {
     activate: function () {
@@ -256,7 +256,7 @@ $.AdminBSB.navbar = {
 
 /* Input - Function ========================================================================================================
 *  You can manage the inputs(also textareas) with name of class 'form-control'
-*  
+*
 */
 $.AdminBSB.input = {
     activate: function () {
@@ -293,7 +293,7 @@ $.AdminBSB.input = {
 
 /* Form - Select - Function ================================================================================================
 *  You can manage the 'select' of form elements
-*  
+*
 */
 $.AdminBSB.select = {
     activate: function () {
@@ -304,7 +304,7 @@ $.AdminBSB.select = {
 
 /* DropdownMenu - Function =================================================================================================
 *  You can manage the dropdown menu
-*  
+*
 */
 
 $.AdminBSB.dropdownMenu = {
@@ -382,7 +382,7 @@ $.AdminBSB.dropdownMenu = {
 
 /* Browser - Function ======================================================================================================
 *  You can manage browser
-*  
+*
 */
 var edge = 'Microsoft Edge';
 var ie10 = 'Internet Explorer 10';
@@ -454,5 +454,8 @@ $(document).ready(function() {
     $.AdminBSB.select.activate();
     $.AdminBSB.search.activate();
 
-    setTimeout(function () { $('.page-loader-wrapper').fadeOut(); }, 50);
-});
\ No newline at end of file
+    if (window.location.href.substring(window.location.href.lastIndexOf('/') + 1)  == "food_court#") {
+    }else{
+      setTimeout(function () { $('.page-loader-wrapper').fadeOut(); }, 50);
+    }
+});
diff --git a/app/assets/javascripts/BSBMaterial/turbolink_admin.js b/app/assets/javascripts/BSBMaterial/turbolink_admin.js
index 50a3a8a2..12e8b751 100644
--- a/app/assets/javascripts/BSBMaterial/turbolink_admin.js
+++ b/app/assets/javascripts/BSBMaterial/turbolink_admin.js
@@ -44,7 +44,7 @@ $.AdminBSB.options = {
 
 /* Left Sidebar - Function =================================================================================================
 *  You can manage the left sidebar menu options
-*  
+*
 */
 $.AdminBSB.leftSideBar = {
     activate: function () {
@@ -157,7 +157,7 @@ $.AdminBSB.leftSideBar = {
 
 /* Right Sidebar - Function ================================================================================================
 *  You can manage the right sidebar menu options
-*  
+*
 */
 $.AdminBSB.rightSideBar = {
     activate: function () {
@@ -189,7 +189,7 @@ $.AdminBSB.rightSideBar = {
 
 /* Searchbar - Function ================================================================================================
 *  You can manage the search bar
-*  
+*
 */
 var $searchBar = $('.search-bar');
 $.AdminBSB.search = {
@@ -226,7 +226,7 @@ $.AdminBSB.search = {
 
 /* Navbar - Function =======================================================================================================
 *  You can manage the navbar
-*  
+*
 */
 $.AdminBSB.navbar = {
     activate: function () {
@@ -256,7 +256,7 @@ $.AdminBSB.navbar = {
 
 /* Input - Function ========================================================================================================
 *  You can manage the inputs(also textareas) with name of class 'form-control'
-*  
+*
 */
 $.AdminBSB.input = {
     activate: function () {
@@ -293,7 +293,7 @@ $.AdminBSB.input = {
 
 /* Form - Select - Function ================================================================================================
 *  You can manage the 'select' of form elements
-*  
+*
 */
 $.AdminBSB.select = {
     activate: function () {
@@ -304,7 +304,7 @@ $.AdminBSB.select = {
 
 /* DropdownMenu - Function =================================================================================================
 *  You can manage the dropdown menu
-*  
+*
 */
 
 $.AdminBSB.dropdownMenu = {
@@ -382,7 +382,7 @@ $.AdminBSB.dropdownMenu = {
 
 /* Browser - Function ======================================================================================================
 *  You can manage browser
-*  
+*
 */
 var edge = 'Microsoft Edge';
 var ie10 = 'Internet Explorer 10';
@@ -455,4 +455,4 @@ $(document).on('turbolinks:load', function() {
     $.AdminBSB.search.activate();
 
     setTimeout(function () { $('.page-loader-wrapper').fadeOut(); }, 50);
-});
\ No newline at end of file
+});
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index bd9018fb..1ef66129 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -65,7 +65,7 @@ $(document).ready(function() {
       clearButton: true,
       date: false
   });
-  
+
   // Image Upload
   $("#simple_menu_item_image_path").fileinput({
       previewFileType: "image",
@@ -148,7 +148,7 @@ $(document).ready(function() {
                 '</div>\n',
     }
   });
-  
+
   $("#commissioner_image_path").fileinput({
       previewFileType: "image",
       allowedFileExtensions: ["jpg", "gif", "png"],
@@ -167,7 +167,7 @@ $(document).ready(function() {
                 '   <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
                 '</div>\n',
     }
-  });   
+  });
 
   $("#employee_image_path").fileinput({
       previewFileType: "image",
@@ -187,7 +187,7 @@ $(document).ready(function() {
                 '   <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
                 '</div>\n',
     }
-  });  
+  });
 
   $("#shop_image").fileinput({
       previewFileType: "image",
@@ -227,7 +227,7 @@ $(document).ready(function() {
                 '   <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
                 '</div>\n',
     }
-  });    
+  });
 
   // first input focus for all form
   $('form:first *input[data-behaviour!=datepicker]:input[type!=hidden]:first').focus();
@@ -252,4 +252,4 @@ Chart.scaleService.updateScaleDefaults('linear', {
         }
     }
 });
-/* chartkick js YAxis value override */
\ No newline at end of file
+/* chartkick js YAxis value override */
diff --git a/app/views/foodcourt/addorders/detail.html.erb b/app/views/foodcourt/addorders/detail.html.erb
index 8f5ea201..3252256f 100644
--- a/app/views/foodcourt/addorders/detail.html.erb
+++ b/app/views/foodcourt/addorders/detail.html.erb
@@ -93,7 +93,7 @@
         <li class="nav-item product" data-ref="<%= foodcourt_get_all_product_path %>">
          <a class="nav-link" data-toggle="tab" href="" role="tab">Products</a>
        </li>
-      <%end%> 
+      <%end%>
      </ul>
    </div>
  </div>
@@ -472,8 +472,9 @@ function getAllMenu(){
         localStorage.setItem("menus", menus);
         if (result != null ) {
           menu_cache_append(result);
-          $( "#loading_wrapper").hide();
+          $("#loading_wrapper").hide();
           $("#oqs_loading_wrapper").css("display", "none");
+          $(".page-loader-wrapper").css("display", "none");
         }
       }
   });