How do I reorder my songs on an album? I upgraded to ios7 this morning, and now all my albums have their songs out of order. Does anyone know where the setting to change them back to album order is?

I can't find anything to indicate that shuffle is switched on (it does say "Shuffle" in the top right, but when I press it, it just changes to a highlighted "Shuffle All", which I don't think I want.)
Please use the

Settings -> General -> Reset -> Reset All Settings.

to reset your settings after the ios7 installation.

that should take care of your problem.