documentation and layout stuff. position n whatnot
Merge remote-tracking branch 'origin/master' into feature/better-typography