More usability fixes

![screen shot 2014-11-24 at 12 53 34 am](https://cloud.githubusercontent.com/assets/222583/5168773/8605acc6-73b6-11e4-8b3a-b14282b1062b.png)
![screen shot 2014-11-24 at 12 53 31 am](https://cloud.githubusercontent.com/assets/222583/5168772/86059650-73b6-11e4-9ffa-255fa9fd3916.png)