Fix location and date display