fix menu navigation in new layout