Updated the time markup with generic elements and without the slash