Done with the search algorithm now doing more editing to the UI