fix grid layout issues