Cosmetic changes to MP1 SetupForm