Fixed navigation duplication issue