Regroup settings in more logical groups