easier to make it look nice on my machine
Merge branch 'master' into prod
Merge branch 'master' into prod
Merge branch 'master' into prod
Merge branch 'master' into prod
fixup new code and updates
various html page improvements like doctype and title