Fix Date time format
Updated layout time
Merge the commits