add navigate feedback
merge with master