added faq search logic and design integration
git conflict removed