Alterations to the menu

References #1219 and #1258.

These changes look like this:

![screenshot - 11262014 - 06 18 07 pm-fs8](https://cloud.githubusercontent.com/assets/202757/5205588/c7f5ed24-7598-11e4-897e-773f0ed71dda.png)
![screenshot - 11262014 - 06 18 22 pm-fs8](https://cloud.githubusercontent.com/assets/202757/5205589/c7fbd25c-7598-11e4-8132-89f24747dee7.png)