Code refactored and fixed campaign form