Galaxy S2 native music player song orders?

I have recently traded in my Galaxy S for the S2, and noticed some of my songs from albums are listed alphabetically, while other albums have songs in CD order. I've already uploaded all the songs I could want and none of my files have a number preceding the track name and doing so is frankly not the fix I'm looking for. I'm adverse to grabbing a new player, simply for lack of knowing which to get.

I manually copied folders and individual files from Explorer onto my phone. Any help would be appreciated.