Fixed more upgrade/ui bugs..