Fix school upgrades, nicer styles