add nav page; add faq item in ment
small fixes
solving conflict
solve conflict