ui issue with tenant fixed