add Layouts and remove a parser bug