Add arrows to show current sort order direction
Refactoring