cleanup and layout fixes

![Screen Shot 2013-02-14 at 3 15 16 PM](https://f.cloud.github.com/assets/1080613/158571/ab6da0b4-76eb-11e2-8886-90c4bbd3deca.png)