Enhancements to layouts