Refractored timeline and added relayout ability