Multiple improvements from IPPF related to layouts. (#1081)