Added and fixed the menu system, added a few styles that were lost in merge conflicts.

![](http://content.screencast.com/users/mlaurenmaxwell/folders/Jing/media/af560eaf-7a6c-4c24-9a35-b5eeacb78669/00000272.png)