Updated HTML and JS