Beta stuff
Menu fixes
Menu fixes