Layout enhancements.