Swap some options for better layout