Changed first primarybtnonenter then submitonenter