Activity and timelines controller added