Navigation options fixed.

see #585