Non static-column gradebook fixes
Non static-column gradebook fixes