add search, fix visual