staff search and fix and some style tweaks