Refactors question so can edit inline, fixes many modals