change the sorting

and also in css