improve core & improve grid