Done few cleanups and supports dynamic additions of form elements