a few changes to nav tpl
Merge remote-tracking branch 'origin/master'