tooltip and upgrade button bugfix