diff --git a/app/assets/javascripts/BSBMaterial/admin.js b/app/assets/javascripts/BSBMaterial/admin.js
index e93b0186..50a3a8a2 100755
--- a/app/assets/javascripts/BSBMaterial/admin.js
+++ b/app/assets/javascripts/BSBMaterial/admin.js
@@ -444,7 +444,7 @@ $.AdminBSB.browser = {
 }
 //==========================================================================================================================
 
-$(document).ready(function(){
+$(document).on('turbolinks:load', 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 85f632ea..bb09d5ac 100755
--- a/app/assets/javascripts/BSBMaterial/demo.js
+++ b/app/assets/javascripts/BSBMaterial/demo.js
@@ -1,4 +1,4 @@
-$(document).ready(function(){
+$(document).on('turbolinks:load', function() {
     skinChanger();
     activateNotificationAndTasksScroll();
 
diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 620e7490..4d66cfab 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -24,7 +24,7 @@
 //= require BSBMaterial/demo.js
 //= require custom.js
 
-$(document).ready(function(){
+$(document).on('turbolinks:load', function() {
 
 	$(".nav-completed").on("click", function(){
        $("#completed").removeClass('hide')
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 6c2b2c4d..2fe04719 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -11,11 +11,12 @@
 // about supported directives.
 //
 //= require jquery
+//= require jquery.turbolinks
 //= require tether
+//= require jquery_ujs
 //= require bootstrap/js/popper.min
 //= require bootstrap/js/bootstrap-material-design.min
 //= require jquery_nested_form
-//= require jquery_ujs
 //= require momentjs/moment
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
 //= require multi-select/js/jquery.multi-select.js
@@ -26,16 +27,16 @@
 //= require autosize/autosize.js
 //= require jquery-countto/jquery.countTo.js
 //= require raphael/raphael.min
-//= require morrisjs/morris.js
 //= 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).ready(function(){
+$(document).on('turbolinks:load', function() {
   $('.count-to').countTo();
 
   //Sales count to
diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js
index 18e16e8d..7d37793c 100644
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -1,4 +1,4 @@
-$(document).ready(function(){
+$(document).on('turbolinks:load', function() {
   $('body').bootstrapMaterialDesign();
 
   var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index d6ad05e6..84799a93 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -1,42 +1,40 @@
 //= require jquery
 //= require tether
+//= require jquery_ujs
 //= require bootstrap/js/popper.min
 //= require bootstrap/js/bootstrap-material-design.min
-//= require jquery_ujs
-//= require turbolinks
-//= require cable
 //= require momentjs/moment
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
 //= require jquery-slimscroll/jquery.slimscroll.js
 //= require bootstrap-notify/bootstrap-notify.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
+//= require cable
+//= require turbolinks
 //= require BSBMaterial/admin.js
 //= require BSBMaterial/demo.js
 //= require custom.js
 
-
 $(document).on('turbolinks:load', function() {
-  $('.datetimepicker').bootstrapMaterialDatePicker({
-      format: 'DD-MM-YYYY - HH:mm',
-      clearButton: true,
-      weekStart: 1
-  });
+	$('.datetimepicker').bootstrapMaterialDatePicker({
+	  format: 'DD-MM-YYYY - HH:mm',
+	  clearButton: true,
+	  weekStart: 1
+	});
 
-  $('.datepicker').bootstrapMaterialDatePicker({
-      format: 'DD-MM-YYYY',
-      clearButton: true,
-      weekStart: 1,
-      time: false
-  });
+	$('.datepicker').bootstrapMaterialDatePicker({
+	  format: 'DD-MM-YYYY',
+	  clearButton: true,
+	  weekStart: 1,
+	  time: false
+	});
+
+	$('.timepicker').bootstrapMaterialDatePicker({
+	  format: 'HH:mm',
+	  clearButton: true,
+	  date: false
+	});
 
-  $('.timepicker').bootstrapMaterialDatePicker({
-      format: 'HH:mm',
-      clearButton: true,
-      date: false
-  });
-});
-$(document).ready(function(){
 	// For selected order return
 	var order_status = "";
 	order_status = $(".selected-item").children().find(".orders-order-status").text().substr(0,6).trim();
diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss
index 29ef2e6e..030b0fe1 100755
--- a/app/assets/stylesheets/login.scss
+++ b/app/assets/stylesheets/login.scss
@@ -1,3 +1,4 @@
+@import "material_icons";
 @import "bootstrap/css/bootstrap-material-design.min";
 @import "node-waves/waves";
 @import "animate-css/animate";
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index 7320edf9..213fe705 100755
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -11,8 +11,8 @@
     <link rel="icon" href="favicon.ico" type="image/x-icon">
 
     <!-- Google Fonts -->
-    <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
-    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
+    <!-- <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
+    <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css"> -->
 
     <!-- Bootstrap Core Css -->
     <!-- <link href="plugins/bootstrap/css/bootstrap.css" rel="stylesheet"> -->
@@ -101,9 +101,10 @@
     </div>
     <script type="text/javascript">
         $(document).on('turbolinks:load', function () {
+            $("#login_form_password").focus();
+
             $(".pin_pad").click(function (event) {
-                event.preventDefault();
-                console.log($(this).data("value"));
+                event.preventDefault();                
                 var value = $(this).data("value");
 
                 if (value == "CLR") {
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index 37cf7b1f..060d4739 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -39,9 +39,7 @@
         </div>
     </div>
      <% flash.each do |type, message| %>
-          <% puts type
-          puts message
-          puts "ssssssssssssss" 
+          <%  
           if type == "notice" 
                color = "alert-success"
             elsif type == "error"
@@ -167,8 +165,7 @@
          var animateExit    = $("#noti").attr('data-animate-exit');
          var colorName      = $("#noti").attr('data-color-name');
          var text           = $("#noti").attr('data-message');
-         console.log(text);
-        console.log(colorName);
+
          if (text != null || colorName != null){
             showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit); 
          }
diff --git a/config/locales/mm.yml b/config/locales/mm.yml
index 52faa938..54239960 100755
--- a/config/locales/mm.yml
+++ b/config/locales/mm.yml
@@ -38,7 +38,7 @@ mm:
   category: "အမျိုးအစား"
   processed: "လုပ်ဆောင်ခဲ့ပြီး"
   completed: "ဆောင်ရွက်ပြီးစီး"
-  tax_profile: "Tad Profile"
+  tax_profile: "Tax Profile"
   payment_methods: "Payment Methods"
   accounts: "Accounts"