Layout enhancements