Menu restyling and organization

Fixes issue #570

![screen shot 2014-01-09 at 1 02 37 pm](https://f.cloud.github.com/assets/930642/1882089/122a671e-7971-11e3-8314-df8099e82edf.png)
![screen shot 2014-01-09 at 11 40 56 am](https://f.cloud.github.com/assets/930642/1882090/12357e42-7971-11e3-9a71-d829403ce3a6.png)