Iteration C1 and C2 add catalog and page layout