Hi guys! Is the weapon order still off, do you know?

Checked this out just now, and it is still in an odd order.

For clarification, it's ONLY on the customize tab for picking weapons for a single battle -- not within the armory page itself.