Activity editor JS fixes and loading