Continued working on station upgrades

Also continued generalizing upgrade screen code