Fixed indenting
Forms are now split into required and optional #1575