reworked search model
tidied up layout xml