Edit tab upgrade+issues