layout and parser fix