Fixed Callback Issue / Refactoring

-Refactored code to support the new survey format
-Callback issue is finally fixed!