Categorize and rework settings menu