Container changes

...dual pages.  This will allow more flexible layouts.