Updates to Form1 and Form2

No Checkboxes