Improved HTML structure and fixes

The main fix is that Zepto / jQuery include is correct now.  Other
changes are mainly cosmetic.