Refactored campaign_new and campaign_edit to rely less on campaign_id session variable; minor fixes