NavbarSettings: cleanup