Button and Menu management enhanced