Hey Steven,
I actually didn’t know you could re-arrange the fields in the address section using the shortcodes, handy to know that. Anyway that will work for us.
Let me know how I can help with adding the district field!
