Main edits merge

Version 1 of the design almost over.   Fonts + Logo left