[27] Fix Timeline component
Merge pull request #28 from Iuckyman/27_Fix_Timeline_component

[27] Fix Timeline component