Fixes to CFO page and nav menu