Returns should all be in one section with labels: new, defect, or core. This will streamline returns and make sure nothing gets missed. The Warranty section should only be for labor.