Fixed bugs in menu