multiple changes in html, js and js. Work in progress.