Fixed part of B2 layout troubles