Fix grid container issues