Merge "Update sorting UI and other UI"