fixed non-context highlighting nav issue, and nav datastate bug