[#818] Tweaks to grid component