Update HTML layout/content
Merge branch 'filling-in-layout'