Bug fix

Improved abstraction
Better activity presentation template