Modification to order by, this should show them in the correct order now.