School fixes: School form