add search and wait spinner

et al