Finished base Grid and added some more changes