Menu fixes

Changed from map to list to vector and really didnt change much....
Nested menus work better though. Plus no more direct access to menu
items, which should make it more stable and less prone to screwing with
things.