few tweaks to Grid
fixing conflicts