School modal added back in + bug fixes