Refactor navigation for vertical consistency