Minor update

Removed naming references, added search form, added menus to functions