Fixes to HTML & JS