Edit nagivation links
Fix filter