Cleaning up code and HTML for a good 1st demo.