Changes look nice. I think it's sorting properly now