Partial 2.4.10 Resolve Pending Issues

Have form partially done for school ids
Partial 2.4.10 Resolve Pending Issues

Made look a little better