Fixed Menus for 1.7 compatibility