More template work on the activities