added timers to timeline
Merge branch 'Development' into merging
convert timer button to label