MYGUIDE-587 MYGUIDE-589 MYGUIDE-632

language bugs
layout bugs
small parser update