fixed activity creation form js
Merge activity form updates