Refactored navigation layout.