Rearrange some items in setup