Updated final screen and CQ template location