Changed How define menu works