styling for timeline
resolve merge
dynamic times
added distance calculation
added distance calculation (merge)