Reorder fields in New Expense modal

When creating a new expense I would like to be able to reorder the fields in the Assignment category. For example, my workflow would work better if I could swap Category and Payee. When you select a payee it will overwrite the Category if that Payee has a Category assigned to it. Some Payees might have multiple categories resulting in having to reselect the desired Category.

For example, BFS is a convenience store and a gas station. I generally purchase gas at this store but when I go in a place the expense as Convenience Store and at first I see this:

Once I select BFS as Payee see this: