Fix Bug 886513: Adjust Nav For R3

fixed mkelly suggestions