Improve sorting by performance
Small visual changes