fix the menu issues