Remove time/date & improve time section