Fix grid layout + CSS