solves nav errors and simplifies logic
Merge pull request #10 from javiercejudo/navigation

Solves nav errors and simplifies logic. Solves issue #8