Make navigation more flexible