Changed variables and grid component