Clean up of Javascript and HTML to simplify demo

Plus some earlier stuff to check about requirements.