refactoring/corrections for navigator class