make grid responsive, code clean up