Rolled NAV T0 and NAV T-1 into same report

Signed-off-by: jsu <jsu@falconfone.com>