Improved HTML and JS