ticket:59 fix menu