Grid refactor and clean up (Multivitamin migrate)