Add Notes & Fix Favorites