Improved survey and data collection tool

Improved survey and data collection tool