Feature/issue 360 grammar v3.1

Implement and move to grammar v3.1

This PR also fixes the removal of the intro text: the whole intro layout is removed if the intro text is empty (as opposed to only the `TextView`), so we gain more space than before.