Fix remaining time displays at the wrong place