2 Commits (fix/navigation)