Refactor of Navigator part