Nav fixes continued

Signed-off-by: Dave Nelson <chwebdev1@gmail.com>