Navigation updates.

See #191 and closes #192.