Feature #659: Refactor:Form 'Add Source'