Fixed Searching, please fix menus and flow