Fix layout and parser