layout fix 1.1