Fixed reinitializing keynav on subsequent calls
Merge branch 'options' into develop