Tweaks styles, fixes button alignment

[#22842562448858]


Fixes this, and tweaks some other things.
![image](https://cloud.githubusercontent.com/assets/5456178/5515843/7213a430-8832-11e4-9a06-d39922f2f98d.png)