Fixed grid issue
Updates