Merge masthead changes and also change links on homepage