changed spinner and js loading