Parsing updates and layout fixes