Refactor ux

![mixologistr refactor ux](https://cloud.githubusercontent.com/assets/2309768/5269768/a19b35d6-7a33-11e4-90a3-9bc2cdf93ae1.gif)

Ah, forgot to remove that, it's going into my next branch.