Fixed JS order in base template