Updated HTML & JS