Moved icons in timeline
Finalized polishing