Started to separate UI logic from business logic in the activities module.