navi and filter
Merge remote-tracking branch 'origin/navibar' into barpage
merge