Add layout currentSpeed and averageSpeed