Reintroduce nav helper class