Fixes #37, restores correct number displays to nav