Fixed some sorting errors and changed the icons for sorting.