(A2,6) Add Click and Drop Questions (Enhanced)