Re-implemented search
Re-implemented menus