More 2.2 layout issues fixed