Lost of cleanup

Fixed date display issue.