added sorting options and favorite separation