Fix missing </nav> in .page-header and add class name .page-wrap to main
Reorganize page layouts, new class names and tags
Add flexbox to columns, and use new main.page-wrap class name instead of just main