switch the order of these styles in the tables

This is a more natural grouping of similar types, making the data much easier to read.