Refactoring: Survey widget is done partial