More enhancements to layout example.