watched and favorite buttons refactor