Initial commit after removing search results
Removing redundant code and minor bug fixes