Navigation cleanup

This amends some small errors with menus (nothing serious.) 
Super work @mchesterkadwell  this week :star2: :+1: