Please please pleeeeease sort out the naming convention for the upgrade modules.
I accidentally wasted an Advanced Upgrade 4 by turning it into a Masonry Advanced Upgrade, when the table actually wanted an Advanced Masonry Upgrade... which is not an advanced upgrade at all! It's a MODERN upgrade. So it should be called a MODERN Masonry Upgrade surely?!