#3437 Grid styles module html + css
Fix merge conflicts