Refactoring lots of stuff.
Merge branch 'master' into deploy

* master:
  Refactoring lots of stuff.
Making nav clickable.
Merge branch 'master' into deploy

* master:
  Making nav clickable.