Activity management (20/25)

Activity management