Added flexibility to form items. cleaned up submit.