Timer fix

Made a change so that if the time till end is less then time till late,
it only shows the time till end.