Rearrange some minor report items