Menu Fixes

A bunch of fixes to the MenuState