home and match layout greatly improved