Navigation options reimplemented (fixes #131, #125)