Updated Edit Survey and improved admin flow