Fixing some js
fixing merge conflict
Fixed the frontend json object name style and the parsing for activity.add