Added search results layout
Fixed merge conflict