FIX sort issue
Update UI