refactored navigation bar