Nav updates take 2