minor spacing tweaks plus renamed lots of html elements using latest html5 conventions