Fixed bugs
Menu - part 1