Improve UI for adding and removing advanced search criteria (#20)