updated with working form and menu searching