Feature/ui sorting