Fix date problems

Fix date problems. Date displayed wrongly.