Restructured grid class, fixed saving issues