Solves nav errors and simplifies logic

Solves issue #8