Merge redesigned Timeline

[ChrisChleb]

The redesign and reimplementation of the timeline is already ongoing and taking place at the following repository.
The enhanced implementation should be merged (by hand) into the main-branch.