rearrange buttons again