Major design changes

![screen shot 2013-08-04 at 3 44 16 am](https://f.cloud.github.com/assets/2876373/906861/7907135a-fcea-11e2-8eed-44e28761a48d.png)