FAQ Modal based on master

Closes #38