Added menu and ability to save and load grids
Fixed merging conflicts