Change sort function, styling changes