Update and refactor faq