Make onItemClick method and tidy up views