Fixed bugs in Menu