Refactoring activity editor again.