Some tweaks to the navigation config and a code change