Adding in throughput measurement.  Also cleaning up HTML on the labels