Partial merge just HTML files from 'tidy-up-codebase' branch