Add Required Form Controls

See #487 for details