Added functionality to add/remove from the My Favorites list + general cleanup