Rearrange and rename buttons