Update Survey Definition Model and UI
Revert "Update Survey Definition Model and UI"

This reverts commit 0eeea9dbc41c5478ae6694029dc5ae974ff0d77c.
Revert "Revert "Update Survey Definition Model and UI""

This reverts commit 9bc8b4d08d5f33a39996c8caeeb0feaed1ef7ca7.