Changed method of creating form/fieldsets

Change-Id: I69dcc19777bd17cb2ab1795a653f8e4b4b84508a