Sorry Jim.  Nothing yet, other than deleting your custom fields and creating them in the arrangement you need.  I agree, it is a pain, and we are looking into it.