rearrange buttons and add menu