fixed issues related to the grid and date time