Rearange the appearance of field entries in admin notification email

Here is the form I am working on http://sitesuperhost.com/redrocknoodlebar/

Because I have a lot of fields on the form, the only way for me to display all of those fields in admin notification email is using {all_fields}. However, the Total field entry is always shown above the Comment entry in the notification email, but I actually want for the "Comment" field entry to be displayed last in the admin notification email.

I have tried changing the places of the two fields on the form itself, tried creating another "Total" or "Comment" field, but whatever I do, the "Total" field is always below the "Comment" field in the admin notification email.

Is there any way of rearranging how is this {all_fields} template displayed OR do I actually have to go through the trouble of adding shortcodes for each field entry manually in the "Notifications" area?

Thanks,