Update form to allow for 2, 3 and 4 fields inline