Form now builds based on fieldsets

Change-Id: I3c08ca3efcf29085b9ad05260ab205fdd0e70cdc