Issue #3474123 by plopesc, smustgrave, alexpott: Reorganize navigation settings to be more consistent
