Rearrange buttons

to be better for fat fingers on mobile