Improved settings sections handling