Continue to implement new layout rules