#34 layout fix