School view bug fixes