Settings redo

![screen shot 2014-03-28 at 4 18 16 pm](https://cloud.githubusercontent.com/assets/152134/2554795/3721849e-b6b6-11e3-95c6-938122248055.png)