Combine fix and add questions into single page

This fixes #2 and #3