[#49715099] Adds simple-navigation for better navbar handling