Minor structural tweaking.
Implemented search button to start over.