done more work on nav