fix bootstrap compilation problem
Rationalise layouts