Add PW 2.5.1+ navigation options