Thank you for the feedback, I certainly agree reducing the number of clicks is something I need to work on. One thought I had was removing the content menu and then having a single screen popup where you can manage everything for that structure including upgrades.