Regarding jump fuel: I’ve always shown a preference to separate the fuels by type and usage, but to keep them in the same section.