#75 layout fix