Payment screen- Payor address Tab stops are out of order

Not a huge problem, but for those of us who are keyboard people and prefer to not use the mouse to activate a field.....

When adding a payment, and adding the address details for the payor, the tab stops for the address are not in the correct order.

After entering the address, it correctly goes to Address 2, but from there it goes to State, but should go to City instead, because choosing the city will auto-populate the state and zip.

From State, it goes to Zip, then email address, then relationship, and then finally to the City.