Segment Timeline changes + Template Rounding Issue Fix