Fix layout, see #8