Fixed Sorting and added styling