Changed form building procedure

Change-Id: I5b03ae8edd0b022093f95ac5eb70536fe9d2ea58