Updates to the layout. Diamond boilerplate added, see: https://github.com/jensdeschrijver/diamond