Wrapped up final changes to Add Survey  Screen (should be good to go)
Revert "Wrapped up final changes to Add Survey  Screen (should be good to go)"

This reverts commit a3905f11937d3ce3c56b2368eba9add1c42c720f.