Add favorites option
Merge branch 'add_favorites_option'