[Layout] Grid adjustments