More roughing out of the layout