ascending and descending sort working + New UI