Add Navigration Conditional - closes #2