Refactor menu and add search.
fix search box.