Cleaned up questionnaires dialogs