Improve sorting UI