Changed order of js loading