Squashed some bugs in the menu system