Moved some js around