Refactoring Grid system, added buggy push classes