Completed new navigation and routing