working on building upgrades, need to rework some of the ui code in order for proper nesting