Navigation updates

Final set of updates for April 15th