Adjusted the JS file order to imporve performance