Following UX fixes

![screen shot 2014-11-24 at 17 18 45](https://cloud.githubusercontent.com/assets/1978880/5169300/f85f134c-73fd-11e4-8ad6-d54d33c43457.png)