added bits in the title
fixed nav filter
fixed merge conflict