bugs in menu fixed