Sorting and view tweak