Update navigation and correct routes match syntax.