Improved timeline rendering. Branches still broken.
Branches fixed!