Merged Custom Header and updated first-page UI to match prototype