CHG: Layout Improvements