Nav fixes for career factors
Ensure rating of custom factors follows input of custom factors
Merge pull request #135 from chcculle/misc-navigation-fixes

Misc navigation fixes