Menu fixes
Merge branch 'Menu_Stuff_0426' of https://github.com/Chargeorge/Studio2 into Menu_Stuff_0426