Improvements to html and js