Form update [MJ-449]

All Tests Pass

Was there anything else to fix or to add to currently?