general bug fixing
fixed navigation issues
Merge pull request #9 from ignacio-valdivieso/bug/fix-navigation

Bug/fix navigation