Tidy up contextual help and search bar