Updated form elements and spacing issues.