new FAQ, removed button to lipsum
faq and merge