Implemented search results page, code cleanup