Settings nav overhaul