Modals, Survey Deletion and more

Much refactored, we have, your codebase.