Adapt new 2.2 layout