favorite & watched buttons work in simpler way