Use nice timing string
Removed all 2.4km section
Added icons