Tighten up the search and surprise buttongs