Refactored and Fix list sort arrows