refactoring of common; added more nav helpers