Some more settings rearrangement