Refact. Add question form.