Merging HTML design update to branch master

Still under construction.