activity editor fixes and improves