UI fix - sorting