Partial 2.4.10 Resolve Pending Issues

Made resolve class form look better