Updated to reflect new method of form building

Change-Id: Ic5a66d66ca17e783b02f9cf48f0399f8a7fd1fae