Layout rearrangement, navigation.js from _s
Increased readability.
Merge branch 'master' into drumlore

* master:
  Layout rearrangement, navigation.js from _s

Conflicts:
	assets/src/scss/_content.scss
	assets/src/scss/_layout.scss
	assets/src/scss/_navigation.scss
	pendrell/header.php
	pendrell/style.css