Partial 2.4.10 Resolve Pending Issues

changed the to and from to new edit style