More progress on checkout page and header