second major round of layout.