Nested layout improvements and simplified layouts.