Added better Grid and modified the base GameObject