Fixed expression tab template structure.
Merge branch 'expression-tab' into demo