added nav type to the advanced panel.
Merge remote-tracking branch 'origin/master'