Fix timeline and acticity