Adds more fields to Campaign and improves forms (issue #2)