Re-ordering fields in pivot table / pivot table wizard

Currently, it is not possible to reorder fields in the pivot table directly and the only way to do so in edit mode is through the wizard. Unfortunately, using the wizard has certain drawbacks. As such, I'd like to suggest one of two things:

1) Re-enable the option to re-order fields directly from the properties or provide an alternative option to re-order dimensions and measures (including Alternatives)

or

2) Fix the following issues with the wizard:

2.1) Currently you can't use the wizard when the pivot contains at least one calculated measure or dimension (which is anything that's not a field or a master item, basically), allow this to be used

2.2) Prevent the wizard from adjusting Show Totals (this should be available in creation mode, but not in edit mode), as this can and does override existing settings at the dimension level each time

2.3) Allow the wizard to adjust the order of Alternative dimensions and measures