grammar: fix layout, rendering and access tracking