add search box
fix bug with search and menu
merge