proper context navigation setup
bug fix on context nav display