Grid updated.

Update grid, 
Please check responsiveness before merge.