Improved layout/nesting.