More menu stuff
Merge pull request #3 from cfeher/chris-feher

More menu stuff