Bug fixes in color grid