Updated text component and grid components to successfully render tokens inside grids and text elems