Search Box #10 and more tidy up