Tweak to html, css and js