Refactored favorites to make more sense