HTML & JS fixes