Partial 2.4.10 Resolve Pending Issues

Made show in different order