Solve UI issue of edit client