#26 Cleanup the search screen, and add 'no result found' indicator