Fixed merge conflict
Added larger text for timeline