Adds timeline for UI
Solves merge conflict