Site: Use nested layouts to dry out markup
Merge pull request #6113 from nschonni/assemble-skeleton

Assemble: Use nested layouts to dry out markup