Refactor FAQ and upload