Minor markup improvement
Merge branch 'layout'