Phase two of implementing the layout