Refactored methods. Bug fixed in navigator