Removed rank fields + Added optin form fields