2 Commits (fixes/1440-menu-navigation)