Some grid fixes to educational view