Moving more of the layout into columnal.