UI for search results done
fix conflicts