Fixed grid column issues