A few UX changes


![aug 18 2014 15 22](https://cloud.githubusercontent.com/assets/840737/3956600/050f9b0e-270d-11e4-876a-5bcf135a3b09.gif)