Now the activities are rendered from a collection.

Cleaned up the code by removing commented code blocks.