Fixed Menus Issue