form updates
merging from form-view branch
added event forms