Rearrange some settings to look a bit better