URL & JS rework