Some serious structure changes shifting the buildings, upgrades, and bou...

...ght upgrades into their own sub tabs and some other bug fixes.