Add swap button

Minor positioning changes as well, both to make up for the new button
and to make the labels pixel-perfect.