Modified search results layout and logic part