Simplified base layout
Merge branch 'master' of https://github.com/n-at/n-at.github.io