Working on the grids more...
Updated the grid layout some more
Updated the grid layout a bit, this branch should be merged for tomorrow and I can do one last one