minor UI changes and SearchService refactoring

Finally had some time on my hand to do some work.