Fixed the menu issue