Visual tweaks + Fixes for #48 and #49

![screen shot 2014-06-07 at 2 53 06 pm](https://cloud.githubusercontent.com/assets/1495261/3209826/227bf8ca-ee8e-11e3-8160-6af218ecf58b.png)