Final tweaks and fixture added for faq