Revert "Revert "Favorites""

This reverts commit afca0ba8e53d078ba843994386012e91b93425ae.