Rearrange settings again