made validation more robust
removed form elements