remove grid from code and use component