Workout Duration text too small and should go to lap time if no countdown

The duration field on the 1030 used to go to lap time if no workout time, this was an obvious and great feature.

Also the text size at the top of screen is wasted by the red bar. Give us text we can read through the red-mist please.