More component things
Grid updated