Fixed javascript loading conflicts