Some site layout refactoring

[ci skip]
Update devDependencies [ci skip]