Changed order of columns on order tables based on what is being pulled from DB.