YH-91: Separated php and j2 navigation