More adjustments for the new layout.