Navigation updates.

See #188.
Navigation updates.

See #191 and closes #192.
Merge branch 'master' into gh-pages