Added more search queries, and improved GUI