Fixed Button and Menu Bugs