Rearrange and align buttons etc to make them pretty

[kaijagahm]

@jdtrat maybe you can help with some css wizardry here?

We can do this closer to the end, when everything else is more or less tied up.