Complete settings rework