Fix Primary Navigation feature