DRY up the nav, fix issue #2