wip - button rearrange