Changes to HTML and main JS