Rearrange button layout