Started redesign of the Timeline component
Merge remote-tracking branch 'origin/master'