Added in subtabs for upgrades and buildings

Also fixed a few bugs