Rearrange controls