Work out the text clearer
Fix bug with search box