Search function completed, apart from tidying reults display