spinner for search, ui code cleanup